Hi, On 2015-08-04 16:19, Paul Tan wrote: > From: Remi Lespinet <remi.lespinet@xxxxxxxxxxxxxxxxxxxxxxx> > > Add the am.threeWay configuration variable to use the -3 or --3way > option of git am by default. When am.threeway is set and not desired > for a specific git am command, the --no-3way option can be used to > override it. > > Signed-off-by: Remi Lespinet <remi.lespinet@xxxxxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Paul Tan <pyokagan@xxxxxxxxx> > --- > I tweaked Remi's patch so it is implemented on top of builtin/am.c. Hopefully > there will be no regressions this time ;) The diff looks obviously correct to me (and yes, I also looked at the context... :-)). Ciao, Dscho -- 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