Hi Jeff, On Wed, Mar 30, 2016 at 10:15 AM, Jeff King <p...@peff.net> wrote: > I noticed that I could not get a patch from Junio to apply earlier > today, and I think it is a regression in the builtin git-am > implementation. I had trouble reproducing with a basic test case, > though. > > Basically, I picked up the three patches from this sub-thread: > > http://thread.gmane.org/gmane.comp.version-control.git/288987/focus=290222 > > and tried to apply them on top of v2.8.0. > > Doing it with "git am -3 patches" works. But doing it with: > > git am patches > git am -3 > > doesn't. Bisecting shows that it did work before 783d7e8 (builtin-am: > remove redirection to git-am.sh, 2015-08-04).
Yeah, with "git am -3" when resuming, the -3 will only affect the current conflicting patch since 852a171 (am: let command-line options override saved options, 2015-08-04). Regards, Paul -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
