Re: [PATCH] git-am: add am.threeWay config variable

2015-08-19 Thread Matthieu Moy
Paul Tan pyoka...@gmail.com writes: On Tue, Aug 18, 2015 at 5:36 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: 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

Re: [PATCH] git-am: add am.threeWay config variable

2015-08-19 Thread Paul Tan
On Tue, Aug 18, 2015 at 5:36 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: 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.

Re: [PATCH] git-am: add am.threeWay config variable

2015-08-18 Thread Matthieu Moy
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

Re: [PATCH] git-am: add am.threeWay config variable

2015-08-07 Thread Johannes Schindelin
Hi, On 2015-08-04 16:19, Paul Tan wrote: 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

[PATCH] git-am: add am.threeWay config variable

2015-08-04 Thread Paul Tan
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