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

Re: [PATCH v2] Teach merge the '[-e|--edit]' option

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 10, 2011, 15:23 UTC
Message-ID
<7vmxd8oopl.fsf@alter.siamese.dyndns.org>
In-Reply-To
<m3ehyl1g5v.fsf@localhost.localdomain>
Jakub Narebski <jnareb@gmail.com> writes:
Show 7 quoted lines
> Yet another issue is if we should blindly trust automatic merge resolution.
> It is considered a good practice by some to always check (e.g. by compiling
> and possibly also running tests) the result of merge, whether it required
> merge conflict resolution or not.
>
> IIRC Linus lately said that making "git merge" automatically commit
> was one of bad design decisions of git, for the above reason...
I think your recalling this discussion
    http://thread.gmane.org/gmane.linux.kernel/1191100/focus=181362

While I agree with what Linus said in the message, I think you are not remembering the discussion correctly. It was about bad commit _message_, and an improvement is not to let users tweak a cleanly automerged result, but is to allow users or force them to always write their own message, perhaps with "merge --[no-]edit", which is exactly the point of Jay's patch in this thread.

Previous: Matthieu Moy
Message 15 of 15 in “Teach merge the '[-e|--edit]' option”
  1. Teach merge the '[-e|--edit]' optionJay Soffian, Oct 7, 2011
  2. Junio C HamanoOct 7, 2011
  3. Jay SoffianOct 7, 2011
  4. Junio C HamanoOct 7, 2011
  5. Jay SoffianOct 7, 2011
  6. Jay SoffianOct 7, 2011
  7. Junio C HamanoOct 7, 2011
  8. Teach merge the '[-e|--edit]' optionJay Soffian, Oct 7, 2011
  9. Junio C HamanoOct 7, 2011
  10. Jay SoffianOct 8, 2011
  11. Junio C HamanoOct 9, 2011
  12. Junio C HamanoOct 10, 2011
  13. Jakub NarebskiOct 10, 2011
  14. Matthieu MoyOct 10, 2011
  15. Junio C HamanoOct 10, 2011

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.