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

[PATCH 0/2] rebase: a couple of fixup fixes

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Jul 17, 2026, 16:06 UTC
Message-ID
<cover.1784304378.git.phillip.wood@dunelm.org.uk>

These patches fix a couple of small bugs in the way skipped "fixup" and "squash" commands are handled. A skipped command can lead to an incorrect commit count in the template message which is fixed in patch 1. It can also mean we fail to open the editor after a "fixup -c" command which is fixed in patch 2

base-commit: d35c5399e3e54ac277bb391fc2f6be3e816d312b
Published-As: https://github.com/phillipwood/git/releases/tag/pw%2Frebase-fixup-fixes-part-1%2Fv1
View-Changes-At: https://github.com/phillipwood/git/compare/d35c5399e...7c8075ff2
Fetch-It-Via: git fetch https://github.com/phillipwood/git pw/rebase-fixup-fixes-part-1/v1
Phillip Wood (2):
  rebase -i: fix counting of fixups after rebase --skip
  rebase: remember fixup -c after skipping fixup/squash
 sequencer.c                     | 31 ++++++++++++++++++----
 t/t3418-rebase-continue.sh      | 36 ++++++++++++++++++++++---
 t/t3437-rebase-fixup-options.sh | 47 +++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+), 9 deletions(-)
-- 
2.54.0.200.gfd8d68259e3
Next: Phillip Wood
Message 1 of 10 in “rebase: a couple of fixup fixes”
  1. 0/2 rebase: a couple of fixup fixesPhillip Wood, Jul 17, 2026
  2. 1/2 rebase -i: fix counting of fixups after rebase --skipPhillip Wood, Jul 17, 2026
  3. Junio C HamanoJul 24, 2026
  4. 2/2 rebase: remember fixup -c after skipping fixup/squashPhillip Wood, Jul 17, 2026
  5. Junio C HamanoJul 24, 2026
  6. Phillip WoodJul 26, 2026
  7. Junio C HamanoJul 26, 2026
  8. 0/2 rebase: a couple of fixup fixesPhillip Wood, Jul 26, 2026
  9. 1/2 rebase -i: fix counting of fixups after rebase --skipPhillip Wood, Jul 26, 2026
  10. 2/2 rebase: remember fixup -c after skipping fixup/squashPhillip Wood, Jul 26, 2026

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.