From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
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>
Subject: Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable
Date: Tue, 02 Jun 2015 15:37:27 +0200 [thread overview]
Message-ID: <vpqvbf6jko8.fsf@anie.imag.fr> (raw)
In-Reply-To: <1433251472-29460-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> (Remi Lespinet's message of "Tue, 2 Jun 2015 15:24:32 +0200")
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> writes:
> +if test "$(git config --bool --get am.threeWay)" = true
> +then
> + threeway=t
> +fi
I think you missed Paul's remark on this:
http://article.gmane.org/gmane.comp.version-control.git/270150
Not terribly important since am will be rewritten soon, though.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-06-02 13:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 13:24 [PATCH/RFC v2 1/2] t4150-am: refactor am -3 tests Remi Lespinet
2015-06-02 13:24 ` [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable Remi Lespinet
2015-06-02 13:37 ` Matthieu Moy [this message]
2015-06-02 13:52 ` Remi LESPINET
2015-06-02 14:01 ` Eric Sunshine
2015-06-02 14:37 ` Paul Tan
2015-06-02 13:58 ` Mikael Magnusson
2015-06-02 14:13 ` 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=vpqvbf6jko8.fsf@anie.imag.fr \
--to=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;
as well as URLs for NNTP newsgroup(s).