From: Johannes Schindelin Date: Wed, 17 Jun 2015 08:15:27 GMT Subject: [PATCH 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD Message-ID: In-Reply-To: <20150616140612.Horde.a1irZQmh2o42SqDfxAytHg1@webmail.informatik.kit.edu> Gábor's mail reminded me that this bug bites me often enough when rebasing Git for Windows. The symptom is that .git/CHERRY_PICK_HEAD is left behind after skipping an already-merged patch with `git rebase --continue` instead of `git rebase --skip`. I always prefer the former invocation because the latter would also skip legitimate patches if there were merge conflicts, while the former would not allow that. Johannes Schindelin (2): t3404: demonstrate CHERRY_PICK_HEAD bug rebase -i: do not leave a CHERRY_PICK_HEAD file behind git-rebase--interactive.sh | 6 +++++- t/t3404-rebase-interactive.sh | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) -- 2.3.1.windows.1.9.g8c01ab4