Add --no-commit to git-merge/git-pull.