Add merge and push settings to ~/.gitconfig
Define a handful of git aliases