From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 02 Jun 2015 20:19:21 GMT
Subject: Re: [PATCH/RFC v3 4/4] git-am: add am.threeWay config variable
Message-ID: <xmqqy4k12792.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1433266446-2845-4-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>

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

> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
> index d412f6b..0472182 100644
> --- a/Documentation/git-am.txt
> +++ b/Documentation/git-am.txt
> ...
> +am.threeWay::
> +	By default, git-am will fail if the patch does not apply cleanly. When
> +	set to true, this setting tells git-am to 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 (equivalent to giving the --3way
> +	option from the command line).
> +	See linkgit:git-am[1].

Same comment as 2/4 applies here.