Default to fast-forward merges in git.
Add the git-clean-merge-files git command.