The last end-user use I can think of for git-merge instead of git-pull is providing a custom commit message. Would it be possible to add -m and -e options to git-pull? The problem I can see is that the latter would have to be added to git-merge, and the guts there are a bit intricate; it uses git-commit-tree directly rather than git-commit, so I can't just pass through the arguments. Assuming it's just as much of a pain for someone else, would it still be worth the effort? Can git-merge be cleaned up? The manual option is to use "git merge --no-commit" and then supply the arguments to git-commit in the usual way. But I notice that --no-commit actually changes git's merging technique. If it's specified, the trivial in-index merge doesn't appear to be attempted. I don't think it makes a huge difference, but is any difference desirable? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html