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

Re: [PATCH] merge: use editor by default in interactive sessions

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Jan 23, 2012, 22:27 UTC
Message-ID
<4F1DDECB.5080904@alum.mit.edu>
In-Reply-To
<7vipk26p1b.fsf@alter.siamese.dyndns.org>
On 01/23/2012 11:18 PM, Junio C Hamano wrote:
> Traditionally, a cleanly resolved merge was committed by "git merge" using
> the auto-generated merge commit log message with invoking the editor.
s/with/without/
Michael
-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 14 in “merge: use editor by default in interactive sessions”
  1. merge: use editor by default in interactive sessionsJunio C Hamano, Jan 23, 2012
  2. Michael HaggertyJan 23, 2012
  3. Junio C HamanoJan 23, 2012
  4. Thomas RastJan 30, 2012
  5. Junio C HamanoJan 30, 2012
  6. merge: add instructions to the commit message when editingThomas Rast, Jan 30, 2012
  7. Junio C HamanoJan 30, 2012
  8. Thomas RastJan 30, 2012
  9. Junio C HamanoJan 30, 2012
  10. Thomas RastJan 31, 2012
  11. Erik Faye-LundFeb 23, 2012
  12. Junio C HamanoFeb 23, 2012
  13. Junio C HamanoFeb 23, 2012
  14. Erik Faye-LundFeb 23, 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.