From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Thu, 04 Jun 2015 15:11:47 GMT
Subject: Re: [PATCH/RFC v4 3/3] git-am: add am.threeWay config variable
Message-ID: <vpqeglrik3w.fsf@anie.imag.fr>
In-Reply-To: <1433430295-10805-3-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>

Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> writes:

> @@ -90,10 +90,13 @@ default.   You can use `--no-utf8` to override this.
>  
>  -3::
>  --3way::
> +--no-3way::
>  	When the patch does not apply cleanly, fall back on
>  	3-way merge if the patch records the identity of blobs
>  	it is supposed to apply to and we have those blobs
> -	available locally.
> +	available locally. `--no-3way` can be used to override
> +	am.threeWay configuration variable. For more information,
> +	see am.threeWay in git-config(1).

... in linkgit:git-config[1].

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/