Jeff King <peff@xxxxxxxx> writes: > On Fri, Mar 01, 2013 at 08:57:03AM -0800, Junio C Hamano wrote: >> >> Nobody seems to use that combination, either from scripts or from C >> (i.e. when opts.update==1 and opts.merge==1, opts.reset is not set) >> with a twoway merge, other than "git am --abort/--skip". > > I can believe it. So do we want to do that fix, then? Did you want to > roll up the two halves of it with a test and write a commit message? I > feel like you could write a much more coherent one than I could on this > subject. I actually was wondering if we can remove that sole uses of two-way merge with --reset -u from "git am" and replace them with something else. But we do want to keep local change that existed before "am" started, so we cannot avoid use of two-way merge, I guess... -- 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