]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Dec 2019 23:09:21 +0000 (15:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Dec 2019 23:09:22 +0000 (15:09 -0800)
While running "revert" or "cherry-pick --edit" for multiple
commits, a recent regression incorrectly detected "nothing to
commit, working tree clean", instead of replaying the commits,
which has been corrected.

* sg/assume-no-todo-update-in-cherry-pick:
  sequencer: don't re-read todo for revert and cherry-pick

1  2 
sequencer.c
t/t3429-rebase-edit-todo.sh

diff --cc sequencer.c
Simple merge
Simple merge