Remi Lespinet <remi.lespinet@xxxxxxxxxxxxxxxxxxxxxxx> writes: > 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@xxxxxxxxxxxxxxxxxxxxxxx> > --- > Documentation/config.txt | 7 +++++++ > Documentation/git-am.txt | 6 ++++-- > git-am.sh | 7 +++++++ > t/t4150-am.sh | 19 +++++++++++++++++++ > 4 files changed, 37 insertions(+), 2 deletions(-) > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index d44bc85..8e42752 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -769,6 +769,13 @@ am.keepcr:: > by giving '--no-keep-cr' from the command line. > See linkgit:git-am[1], linkgit:git-mailsplit[1]. > > +am.threeWay:: > + If true, git-am will fall back on 3-way merge when the patch git-am should be spelled `git am` or 'git am' (the second is used a lot in git-am.txt, but Documentation/CodingGuidelines says: Literal examples (e.g. use of command-line options, command names, and configuration variables) are typeset in monospace, and if you can use `backticks around word phrases`, do so. `--pretty=oneline` `git rev-list` `remote.pushDefault` ) so I guess the first is the right way to typeset it. FYI, the syntax git-am actually existed in the past (before git 1.6). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html