Re: [PATCH/RFC v3 4/4] git-am: add am.threeWay config variable
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:05:06
Remi Lespinet [off-list ref] writes:
quoted hunk
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.