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

Re: [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 8, 2016, 18:51 UTC
Message-ID
<xmqq1t7kls58.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<56DF1EBD.8050503@cs-ware.de>
Sven Strickroth <sven@cs-ware.de> writes:
> Here hook_arg1 would be always "merge" and never "squash"... Before my
> change it was only "squash" if no conflict occurred.

Oh, that wasn't an intended change. It was merely an illustration of a possible restructuring of the flow to avoid having to have identical read functions in two separate places.

Previous: Sven StrickrothNext: Sven Strickroth
Message 5 of 13 in “Commit message not helpful after merge squash with conflicts”
  1. Sven StrickrothMar 5, 2016
  2. Also read SQUASH_MSG if a conflict on a merge squash occurredSven Strickroth, Mar 8, 2016
  3. Junio C HamanoMar 8, 2016
  4. Sven StrickrothMar 8, 2016
  5. Junio C HamanoMar 8, 2016
  6. commit: do not lose SQUASH_MSG contentsSven Strickroth, Mar 8, 2016
  7. Junio C HamanoMar 9, 2016
  8. Junio C HamanoMar 9, 2016
  9. commit: do not lose SQUASH_MSG contentsSven Strickroth, Mar 13, 2016
  10. Junio C HamanoMar 14, 2016
  11. Junio C HamanoMar 14, 2016
  12. commit: do not lose SQUASH_MSG contentsSven Strickroth, Mar 21, 2016
  13. Junio C HamanoMar 21, 2016

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.