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

2015-05-28 Thread Matthieu Moy
Junio C Hamano writes: >> I've noticed that in the block above that initializes all the variables, >> >> sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort= >> messageid= resolvemsg= resume= scissors= no_inbody_headers= >> git_apply_opt= >> committer_date_is_a

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

2015-05-28 Thread Junio C Hamano
Paul Tan writes: >> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt >> index 0d8ba48..3190c05 100644 >> --- a/Documentation/git-am.txt >> +++ b/Documentation/git-am.txt >> @@ -89,11 +89,13 @@ default. You can use `--no-utf8` to override this. >> linkgit:git-mailinfo[1])

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

2015-05-28 Thread Paul Tan
Hi, On Wed, May 27, 2015 at 5:32 AM, Remi Lespinet wrote: > 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-

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

2015-05-26 Thread Remi Lespinet
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 --- Even if git am will be rewritten soon, the code