Git tips & tricks

git-tips-and-tricks.md

• Commit fixup & rebase autosquash

• Rebase branch if origin & remote diverged:

git rebase origin/master

• Review difference of local and remote branch:

git log HEAD..origin/master

• Remove .orig files:

find . -name '*.orig' -delete

• Remove ignored files

git rm -r --cached .
git add .

• Most frequenty changed files. Shows how many times a file was affected by a commit.

git log -n 1000 --format=format: --name-only | egrep -v '^$' | grep '\.[h|m]$' | sort | uniq -c | sort -r | head -20