Remi Lespinet <[email protected]> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
