From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Jun 2015 16:43:39 GMT
Subject: Re: [PATCH 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD
Message-ID: <xmqqvbem2slg.fsf@gitster.dls.corp.google.com>
In-Reply-To: <cover.1434528725.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> writes:

> 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.

Makes sense; will queue.  Thanks.