Git

Keeping track of all the cool features I use (and I tend to forget) of git.

Resetting a file to its pre-merge status November 2016
Reordering and modifying git commits November 2016