]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pw/rebase-reread-todo-after-editing'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Oct 2021 20:40:12 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Oct 2021 20:40:12 +0000 (13:40 -0700)
The code to re-read the edited todo list in "git rebase -i" was
made more robust.

* pw/rebase-reread-todo-after-editing:
  rebase: fix todo-list rereading
  sequencer.c: factor out a function

1  2 
sequencer.c
sequencer.h

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