Re: FW: question about merge in 1.7.10

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: FW: question about merge in 1.7.10

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:08

Marlene Cote [off-list ref] 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?

RE: FW: question about merge in 1.7.10

From: Marlene Cote <hidden>
Date: 2016-06-15 22:53:08

Sorry.  You are correct.  You said it would open an editor session.  

-----Original Message-----
From: Junio C Hamano [mailto:gitster@pobox.com] 
Sent: Friday, February 24, 2012 4:23 PM
To: Marlene Cote
Cc: Zbigniew Jędrzejewski-Szmek; git@vger.kernel.org
Subject: Re: FW: question about merge in 1.7.10

Marlene Cote [off-list ref] 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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help