Adding a git settings file, to do things like alway use --no-ff on merges and --rebase on pulls.