diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2015-06-18 18:38:53 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-29 13:12:43 -0700 |
| commit | 0e0aff4b4ca93053a83578cb040475c6e3185f2d (patch) | |
| tree | bbbd4458915698daf4fd50b4a17b322d734b52b4 /diffcore-rename.c | |
| parent | t3404: demonstrate CHERRY_PICK_HEAD bug (diff) | |
| download | tgif-0e0aff4b4ca93053a83578cb040475c6e3185f2d.tar.xz | |
rebase -i: do not leave a CHERRY_PICK_HEAD file behind
When skipping commits whose changes were already applied via `git rebase
--continue`, we need to clean up said file explicitly.
The same is not true for `git rebase --skip` because that will execute
`git reset --hard` as part of the "skip" handling in git-rebase.sh, even
before git-rebase--interactive.sh is called.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-rename.c')
0 files changed, 0 insertions, 0 deletions