| commit | 4258a6da90988439af1d6008a3172d25efcbf2a1 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 2 Jan 2017 15:27:30 +0000 (2 16:27 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jan 2017 22:57:29 +0000 (9 14:57 -0800) | ||
| tree | 388629d35105036ccb00464b1330cde905404a33 | treesnapshot (tar.gz zip) |
| parent | 5263220967209c7a64c065054fb64036815ac2ee | commitdiff |
sequencer (rebase -i): skip some revert/cherry-pick specific code path
When a cherry-pick continues without a "todo script", the intention is
simply to pick a single commit.
However, when an interactive rebase is continued without a "todo
script", it means that the last command has been completed and that we
now need to clean up.
This commit guards the revert/cherry-pick specific steps so that they
are not executed in rebase -i mode.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When a cherry-pick continues without a "todo script", the intention is
simply to pick a single commit.
However, when an interactive rebase is continued without a "todo
script", it means that the last command has been completed and that we
now need to clean up.
This commit guards the revert/cherry-pick specific steps so that they
are not executed in rebase -i mode.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory |