Better diff tool to use with git:

$ packer -Sy icdiff To use: $ git icdiff …

Custom commands:

On your ~/.gitconfig file, you can define some alias to some more complex commands on git, or event new functionality (like a more succint git log that graphically shows branches and merges). Here are is my gitconfig file with some customizations: https://github.com/tiagoprn/dot_files/blob/master/.gitconfig .