Shawn Pearce <spearce@xxxxxxxxxxx> writes: > Why does git-am use git-merge-resolve while git-rebase -m uses > git-merge-recursive? The use of merge-resolve by am predates merge-resolve became usable by at least six weeks, and longer before merge-resolve became really stable for about an extra month after. Even after it stabilized merge-recursive was way slower than merge-resove until it was rewritten in C for another nine months. - 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