From: Paul Tan <pyokagan@gmail.com>
Date: Tue, 02 Jun 2015 14:37:13 GMT
Subject: Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable
Message-ID: <CACRoPnSZ77mOvqRn+PLauDyQtjU8gDvtUKPmUzLo6Hc4CE+RvQ@mail.gmail.com>
In-Reply-To: <vpqvbf6jko8.fsf@anie.imag.fr>

Hi,

On Tue, Jun 2, 2015 at 9:37 PM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> 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.

As the person who had to do four preparatory patch series' to fix bugs
for the rewrite of git-pull, I respectfully disagree ;-)

Regards,
Paul