From: Junio C Hamano <gitster@pobox.com>
To: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Cc: git@vger.kernel.org,
Remi Galan <remi.galan-alfonso@ensimag.grenoble-inp.fr>,
Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>,
Louis-Alexandre Stuber
<louis--alexandre.stuber@ensimag.grenoble-inp.fr>,
Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCH/RFC v3 4/4] git-am: add am.threeWay config variable
Date: Tue, 02 Jun 2015 13:19:21 -0700 [thread overview]
Message-ID: <xmqqy4k12792.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1433266446-2845-4-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> (Remi Lespinet's message of "Tue, 2 Jun 2015 19:34:06 +0200")
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> 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.
next prev parent reply other threads:[~2015-06-02 20:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 17:34 [PATCH/RFC v3 1/4] git-am.sh: fix initialization of the threeway variable Remi Lespinet
2015-06-02 17:34 ` [PATCH/RFC v3 2/4] git-am.txt: add configuration section in git am documentation Remi Lespinet
2015-06-02 20:16 ` Junio C Hamano
2015-06-03 5:50 ` Torsten Bögershausen
2015-06-03 8:26 ` Remi Lespinet
2015-06-04 5:57 ` Torsten Bögershausen
2015-06-03 16:21 ` Matthieu Moy
2015-06-03 16:42 ` Junio C Hamano
2015-06-03 17:33 ` Remi Lespinet
2015-06-04 13:26 ` Remi Lespinet
2015-06-02 17:34 ` [PATCH/RFC v3 3/4] t4150-am: refactor am -3 tests Remi Lespinet
2015-06-02 17:34 ` [PATCH/RFC v3 4/4] git-am: add am.threeWay config variable Remi Lespinet
2015-06-02 20:19 ` Junio C Hamano [this message]
2015-06-03 16:31 ` Matthieu Moy
2015-06-03 16:43 ` Remi Lespinet
2015-06-02 20:19 ` [PATCH/RFC v3 1/4] git-am.sh: fix initialization of the threeway variable Junio C Hamano
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=xmqqy4k12792.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--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