Updated .gitconfig

Removed --no-ff from branch and made new alias