Enable automatic tracking branch on git-merge w/o param

See http://stackoverflow.com/a/16223800 for more information