git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d17ec3a)
rebase -i: do not leave a CHERRY_PICK_HEAD file behind
authorJohannes Schindelin <redacted>
Thu, 18 Jun 2015 16:38:53 +0000 (18:38 +0200)
committerJunio C Hamano <redacted>
Mon, 29 Jun 2015 20:12:43 +0000 (13:12 -0700)
commit0e0aff4b4ca93053a83578cb040475c6e3185f2d
treebbbd4458915698daf4fd50b4a17b322d734b52b4tree | snapshot
parentd17ec3a9daffd7f525f39b52011dc653afcbd275commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-rebase--interactive.sh diff | blob | history
t/t3404-rebase-interactive.sh diff | blob | history
git clone https://git.99rst.org/PROJECT