From: Mikael Magnusson Date: Tue, 02 Jun 2015 13:58:18 GMT Subject: Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable Message-ID: In-Reply-To: <1433251472-29460-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> On Tue, Jun 2, 2015 at 3:24 PM, Remi Lespinet wrote: > 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 > --- > 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 > + cannot be applied cleanly, in the same way as the '-3' or > + '--3-way' option. Can be overridden by giving '--no-3-way' > + from the command line. > + See linkgit:git-am[1]. > + This part spells it 3-way while everywhere else appears to be 3way. -- Mikael Magnusson