From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Aug 2021 22:21:20 GMT
Subject: Re: [PATCH v3] sequencer: advise if skipping cherry-picked commit
Message-ID: <xmqqr1ea1sm7.fsf@gitster.g>
In-Reply-To: <691c660422676c92180feb1c2a88049afe7536b9.1630359271.git.steadmon@google.com>

Josh Steadmon <steadmon@google.com> writes:

> Silently skipping commits when rebasing with --no-reapply-cherry-picks
> (currently the default behavior) can cause user confusion. Issue
> warnings when this happens, as well as advice on how to preserve the
> skipped commits.
>
> These warnings and advice are displayed only when using the (default)
> "merge" rebase backend.
>
> Update the git-rebase docs to mention the warnings and advice.
>
> Signed-off-by: Josh Steadmon <steadmon@google.com>
> ---

Looks sensible.

Will queue.  Let's merge it down to 'next' in a few days and leave
the follow-on work to later.

Thanks.