]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pw/status-rebase-todo' into jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Jun 2026 02:49:20 +0000 (19:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Jun 2026 02:49:20 +0000 (19:49 -0700)
The display of the rebase todo list in "git status" has been
improved to correctly abbreviate object IDs for more commands and
avoid misinterpreting refs as object IDs.

* pw/status-rebase-todo:
  status: improve rebase todo list parsing
  sequencer: factor out parsing of todo commands

1  2 
sequencer.c
sequencer.h
wt-status.c

diff --cc sequencer.c
Simple merge
diff --cc sequencer.h
Simple merge
diff --cc wt-status.c
Simple merge