Why does git-am use git-merge-resolve while git-rebase -m uses git-merge-recursive? Can we just change git-am to use git-merge-recursive instead? For one thing its faster, for another it supports the GITHEAD_* feature for naming the hunks in a conflict. -- Shawn. - 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