Paul Tan <pyoka...@gmail.com> writes: > From: Remi Lespinet <remi.lespi...@ensimag.grenoble-inp.fr> > > 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.lespi...@ensimag.grenoble-inp.fr> > Signed-off-by: Paul Tan <pyoka...@gmail.com> > --- > I tweaked Remi's patch so it is implemented on top of builtin/am.c. Hopefully > there will be no regressions this time ;)
Thanks for doing this. I don't remember the details of the regression we had with the shell version, but that would probably deserve an additional test to enforce the "Hopefully there will be no regressions" part of your message. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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
