git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef3ce7c befd4f6)
Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
authorJunio C Hamano <redacted>
Fri, 6 Dec 2019 23:09:21 +0000 (15:09 -0800)
committerJunio C Hamano <redacted>
Fri, 6 Dec 2019 23:09:22 +0000 (15:09 -0800)
commitf233c9f4550a831a69892e0a38db2a7654beb995
treeac12d3bd63de58f9b128729192aed904caa6b4f3tree | snapshot
parentef3ce7c4b9f5ed7a13a0efcc576df855c4fd3d0fcommit | diff
parentbefd4f6a81d382cc2b34186b619f734fa5f8070fcommit | diff
Merge branch 'sg/assume-no-todo-update-in-cherry-pick'

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
sequencer.c diff1 | diff2 | blob | history
t/t3429-rebase-edit-todo.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT