Add some of my own git shortcuts and use opendiff mergetool
Ignore tags file always