updated gitconfig to consistently use long-style option names