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

Re: [PATCH v3] sequencer: do not squash 'reword' commits when we hit conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 19, 2018, 16:59 UTC
Message-ID
<xmqqsh5ivhjw.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CABPp-BHFuqh1KVPod+chZD=AKGVBd_apOt6F9oTaZ0ZA66G03Q@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
> [As an aside, I know there are multiple other outstanding emails for
> me to respond to, unrelated to this patch.  I'll try to get some time
> in the next day or two to respond.  Just responding to this one since
> Junio mentioned picking it up for 2.18.]
Thanks for a reminder.

I thought I said that I'll backburner/ignore the topic and expect something that can be picked up to be there when I come back after I cut 2.18 final, but I ended up coming back to read the topic anyway it seems ;-)

Previous: Elijah NewrenNext: SZEDER Gábor
Message 15 of 19 in “[BUG] git-rebase: reword squashes commits in case of merge-conflicts”
  1. chJun 11, 2018
  2. Jeff KingJun 12, 2018
  3. chJun 15, 2018
  4. Elijah NewrenJun 16, 2018
  5. Eric SunshineJun 17, 2018
  6. sequencer: do not squash 'reword' commits when we hit conflictsElijah Newren, Jun 17, 2018
  7. Phillip WoodJun 17, 2018
  8. Johannes SchindelinJun 17, 2018
  9. Phillip WoodJun 18, 2018
  10. Junio C HamanoJun 18, 2018
  11. Johannes SchindelinJun 18, 2018
  12. Phillip WoodJun 19, 2018
  13. sequencer: do not squash 'reword' commits when we hit conflictsPhillip Wood, Jun 19, 2018
  14. Elijah NewrenJun 19, 2018
  15. Junio C HamanoJun 19, 2018
  16. t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'SZEDER Gábor, Aug 23, 2018
  17. Junio C HamanoAug 23, 2018
  18. Johannes SchindelinAug 23, 2018
  19. Johannes SchindelinJun 17, 2018

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.