Why git-merge-resolve in git-am?

From: Shawn Pearce <hidden>
Date: 2016-06-15 22:42:47

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help