Git Hints

A list with useful git hints.

Reset not committed data

git reset --hard

Load file from old revision

git checkout <commit> -- <file>

Merge changes from other branch as one commit

git checkout master
git merge --squash feature-branch-xyz
git status #review changes
git add . 
git commit -m "close #ticketnumber, done feature xyz"