From: Junio C Hamano <gitster@pobox.com>
To: Marlene Cote <Marlene_Cote@affirmednetworks.com>
Cc: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: FW: question about merge in 1.7.10
Date: Fri, 24 Feb 2012 13:22:33 -0800 [thread overview]
Message-ID: <7vbooox6xy.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1F026B57884A5841B330471696849DE9114508EC@MBX021-W4-CA-5.exch021.domain.local> (Marlene Cote's message of "Fri, 24 Feb 2012 19:33:58 +0000")
Marlene Cote <Marlene_Cote@affirmednetworks.com> writes:
> I know that the tree will be dirty. The change to git in 1.7.10 says
> that the merge will require a commit message when the command is run.
I do not think I ever said that.
"merge" will always start an editor when it auto-commits
is what I said.
Could you point me where you read that "will require a commit message", so
that it can be corrected?
next prev parent reply other threads:[~2012-02-24 21:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-24 14:33 FW: question about merge in 1.7.10 Marlene Cote
2012-02-24 19:29 ` Zbigniew Jędrzejewski-Szmek
2012-02-24 19:33 ` Marlene Cote
2012-02-24 21:22 ` Junio C Hamano [this message]
2012-02-24 21:24 ` Marlene Cote
2012-02-24 21:55 ` Junio C Hamano
2012-02-24 20:00 ` 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=7vbooox6xy.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Marlene_Cote@affirmednetworks.com \
--cc=git@vger.kernel.org \
--cc=zbyszek@in.waw.pl \
/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).