summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2015-06-18 16:38:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-29 20:12:43 (GMT)
commit0e0aff4b4ca93053a83578cb040475c6e3185f2d (patch)
treebbbd4458915698daf4fd50b4a17b322d734b52b4 /Documentation/technical
parentd17ec3a9daffd7f525f39b52011dc653afcbd275 (diff)
downloadgit-0e0aff4b4ca93053a83578cb040475c6e3185f2d.zip
git-0e0aff4b4ca93053a83578cb040475c6e3185f2d.tar.gz
git-0e0aff4b4ca93053a83578cb040475c6e3185f2d.tar.bz2
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 'Documentation/technical')
0 files changed, 0 insertions, 0 deletions