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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 30, 2012, 18:17 UTC
Message-ID
<7vd3a1caxb.fsf@alter.siamese.dyndns.org>
In-Reply-To
<87hazdazmb.fsf@thomas.inf.ethz.ch>
Thomas Rast <trast@student.ethz.ch> writes:
Show 14 quoted lines
> I would suggest something like
>
> # Please enter the commit message for your merge commit.  Lines starting
> # with '#' will be ignored, and an empty message aborts the commit.
>
> or if you feel comfortable with educating the user in a
> workflow-specific way, even
>
> # Please enter the commit message for your merge commit.  You should
> # justify it especially if it merges an updated upstream into a topic
> # branch.
> # 
> # Lines starting with '#' will be ignored, and an empty message aborts
> # the commit.

Sounds like a good thing to do. Please make it so.

Previous: Thomas RastNext: Thomas Rast
Message 5 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.