git/list[1] front-page[2] threads[3] people[4] search[5] about
 

RE: FW: question about merge in 1.7.10

From
MCMarlene Cote <marlene_cote@affirmednetworks.com>
Date
Feb 24, 2012, 21:24 UTC
Message-ID
<1F026B57884A5841B330471696849DE911450B9B@MBX021-W4-CA-5.exch021.domain.local>
In-Reply-To
<7vbooox6xy.fsf@alter.siamese.dyndns.org>
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 <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?
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 7 in “FW: question about merge in 1.7.10”
  1. Marlene CoteFeb 24, 2012
  2. Zbigniew Jędrzejewski-SzmekFeb 24, 2012
  3. Marlene CoteFeb 24, 2012
  4. Junio C HamanoFeb 24, 2012
  5. Marlene CoteFeb 24, 2012
  6. Junio C HamanoFeb 24, 2012
  7. Junio C HamanoFeb 24, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.