From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Junio C Hamano <gitster@pobox•com>
Cc: Jonathan Nieder <jrnieder@gmail•com>, git@vger•kernel.org
Subject: Re: [PATCH] merge, pull: stop advising 'commit -a' in case of conflict
Date: Fri, 29 Aug 2014 08:44:09 +0200 [thread overview]
Message-ID: <vpqegvzu75y.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqppfka2bb.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Thu, 28 Aug 2014 11:36:56 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Here is how I phrased in the one queued tentatively.
OK with me, thanks,
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2014-08-29 6:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-27 18:23 [RFC] improving advice message from "git commit" during a merge Junio C Hamano
2014-08-27 19:18 ` Jeff King
2014-08-27 19:28 ` Junio C Hamano
2014-08-28 9:46 ` [PATCH] merge, pull: stop advising 'commit -a' in case of conflict Matthieu Moy
2014-08-28 17:28 ` Junio C Hamano
2014-08-28 17:41 ` Matthieu Moy
2014-08-28 18:16 ` Jonathan Nieder
2014-08-28 18:36 ` Junio C Hamano
2014-08-29 6:44 ` Matthieu Moy [this message]
2014-08-28 12:17 ` [RFC] improving advice message from "git commit" during a merge Stefan Beller
2014-08-28 17:11 ` 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=vpqegvzu75y.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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