olegafx

# Save branch history and revert easily
git merge --no-ff
git revert -m 1 <hash>

# Show n lines of context around diff lines instead of the usual +/- 3
git diff -U<n>

# Check which branches are merged
git branch --merged