| commit | f233c9f4550a831a69892e0a38db2a7654beb995 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Dec 2019 23:09:21 +0000 (6 15:09 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Dec 2019 23:09:22 +0000 (6 15:09 -0800) | ||
| tree | ac12d3bd63de58f9b128729192aed904caa6b4f3 | treesnapshot (tar.gz zip) |
| parent | ef3ce7c4b9f5ed7a13a0efcc576df855c4fd3d0f | commitdiff |
| parent | befd4f6a81d382cc2b34186b619f734fa5f8070f | commitdiff |
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
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 | blobhistory |
| t/t3429-rebase-edit-todo.sh | diff1 | diff2 | blobhistory |