[Git] Add some diff improvements from the interwebs

Taken from http://documentup.com/skwp/git-workflows-book