[PATCH v3 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD

These patches fix a bug that 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

Re: [PATCH v3 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD

On 2015-06-18 21:45, Junio C Hamano wrote: This round looks good, except one trivial nit (below), which I'll locally squash-in a fix for. Thanks, Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH v3 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD

Thanks. This round looks good, except one trivial nit (below), which I'll locally squash-in a fix for. diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index fb1b571..6938e5e 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1052,7