Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

2015-06-02 Thread Paul Tan
Hi, On Tue, Jun 2, 2015 at 9:37 PM, Matthieu Moy wrote: > Remi Lespinet writes: > >> +if test "$(git config --bool --get am.threeWay)" = true >> +then >> +threeway=t >> +fi > > I think you missed Paul's remark on this: > > http://article.gmane.org/gmane.comp.version-control.git/270150 > > No

Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

2015-06-02 Thread Matthieu Moy
Remi Lespinet writes: > 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 > --- > Document

Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

2015-06-02 Thread Eric Sunshine
On Tue, Jun 2, 2015 at 9:52 AM, Remi LESPINET wrote: > Matthieu Moy writes: > >> Remi Lespinet writes: >> >> > +if test "$(git config --bool --get am.threeWay)" = true >> > +then >> > +threeway=t >> > +fi >> >> I think you missed Paul's remark on this: >> >> http://article.gmane.org/gmane.co

Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

2015-06-02 Thread Mikael Magnusson
On Tue, Jun 2, 2015 at 3:24 PM, 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-by: Re

[PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

2015-06-02 Thread Remi LESPINET
Matthieu Moy writes: > Remi Lespinet writes: > > > +if test "$(git config --bool --get am.threeWay)" = true > > +then > > +threeway=t > > +fi > > I think you missed Paul's remark on this: > > http://article.gmane.org/gmane.comp.version-control.git/270150 > > Not terribly important since am w

Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

2015-06-02 Thread Matthieu Moy
Remi Lespinet writes: > +if test "$(git config --bool --get am.threeWay)" = true > +then > +threeway=t > +fi I think you missed Paul's remark on this: http://article.gmane.org/gmane.comp.version-control.git/270150 Not terribly important since am will be rewritten soon, though. -- Matthie

[PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

2015-06-02 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 --- Documentation/config.txt | 7 +++ Document