From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 07 Aug 2015 09:18:27 GMT
Subject: Re: [PATCH] git-am: add am.threeWay config variable
Message-ID: <ee65e46e4a342e4646ae78baf12fbe3b@www.dscho.org>
In-Reply-To: <1438697966-4958-1-git-send-email-pyokagan@gmail.com>

Hi,

On 2015-08-04 16:19, Paul Tan wrote:
> From: Remi Lespinet <remi.lespinet@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.lespinet@ensimag.grenoble-inp.fr>
> Signed-off-by: Paul Tan <pyokagan@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 ;)

The diff looks obviously correct to me (and yes, I also looked at the context... :-)).

Ciao,
Dscho