From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Paul Tan <pyokagan@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Subject: Re: [PATCH] git-am: add am.threeWay config variable
Date: Fri, 07 Aug 2015 11:18:27 +0200 [thread overview]
Message-ID: <ee65e46e4a342e4646ae78baf12fbe3b@www.dscho.org> (raw)
In-Reply-To: <1438697966-4958-1-git-send-email-pyokagan@gmail.com>
Hi,
On 2015-08-04 16:19, Paul Tan wrote:
> From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
>
> 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@ensimag.grenoble-inp.fr>
> Signed-off-by: Paul Tan <pyokagan@gmail.com>
> ---
> I tweaked Remi's patch so it is implemented on top of builtin/am.c. Hopefully
> there will be no regressions this time ;)
The diff looks obviously correct to me (and yes, I also looked at the context... :-)).
Ciao,
Dscho
next prev parent reply other threads:[~2015-08-07 9:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-04 14:19 [PATCH] git-am: add am.threeWay config variable Paul Tan
2015-08-07 9:18 ` Johannes Schindelin [this message]
2015-08-18 9:36 ` Matthieu Moy
2015-08-19 8:33 ` Paul Tan
2015-08-19 9:45 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ee65e46e4a342e4646ae78baf12fbe3b@www.dscho.org \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).