From: Remi LESPINET <remi.lespinet@ensimag.grenoble-inp.fr>
To: Matthieu Moy <Matthieu.Moy@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: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable
Date: Tue, 02 Jun 2015 15:52:09 +0200 [thread overview]
Message-ID: <87vbf6tdyu.fsf@ensimag.grenoble-inp.fr> (raw)
In-Reply-To: <vpqvbf6jko8.fsf@anie.imag.fr> (Matthieu Moy's message of "Tue, 02 Jun 2015 15:37:27 +0200")
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> 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.
Oh right, sorry about that, I modify it and I resend the patch asap
next prev parent reply other threads:[~2015-06-02 13:52 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
2015-06-02 13:52 ` Remi LESPINET [this message]
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=87vbf6tdyu.fsf@ensimag.grenoble-inp.fr \
--to=remi.lespinet@ensimag.grenoble-inp.fr \
--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 \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.