Updated .gitconfig with --no-ff