From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Oct 2019 02:45:04 GMT
Subject: Re: [PATCH 3/3] commit: give correct advice for empty commit during a rebase
Message-ID: <xmqqv9sgi3in.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <0d168b4a75c65e786f4b14f5da723957c32fa390.1571787022.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> Note: we take pains to handle the situation when a user runs a `git
> cherry-pick` _during_ a rebase. This is quite valid (e.g. in an `exec`
> line in an interactive rebase). On the other hand, it is not possible to
> run a rebase during a cherry-pick, meaning: if both `rebase-merge/` and
> `sequencer/` exist, we still want to advise to use `git cherry-pick
> --skip`.

Good description of why the code does what it does, that future
readers will surely appreciate.  Nice.