Couple awesome git tricks15 Oct 2013
For easier conflict resolution use diff3 format. This guy did a good job explaining it.
Found something possibly obsolete but you are not entirely sure if it’s true? Search history for mentions of keyword using the -S flag:
git log -S "keyword"
This will display log entries of commits that have “keyword” added or removed from the repository.