From: Junio C Hamano <gitster@pobox.com>
To: Josh Steadmon <steadmon@google.com>
Cc: git@vger.kernel.org, levraiphilippeblain@gmail.com,
phillip.wood123@gmail.com
Subject: Re: [PATCH v3] sequencer: advise if skipping cherry-picked commit
Date: Mon, 30 Aug 2021 15:21:20 -0700 [thread overview]
Message-ID: <xmqqr1ea1sm7.fsf@gitster.g> (raw)
In-Reply-To: <691c660422676c92180feb1c2a88049afe7536b9.1630359271.git.steadmon@google.com> (Josh Steadmon's message of "Mon, 30 Aug 2021 14:46:02 -0700")
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.
next prev parent reply other threads:[~2021-08-30 22:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 20:53 [RFC PATCH] sequencer: warn on skipping previously seen commit Josh Steadmon
2021-08-04 21:28 ` Junio C Hamano
2021-08-05 10:13 ` Phillip Wood
2021-08-05 16:30 ` Junio C Hamano
2021-08-10 19:20 ` [PATCH v2] sequencer: advise if skipping cherry-picked commit Josh Steadmon
2021-08-10 22:33 ` Junio C Hamano
2021-08-18 10:08 ` Phillip Wood
2021-08-30 21:19 ` Josh Steadmon
2021-08-12 17:45 ` Philippe Blain
2021-08-12 19:13 ` Junio C Hamano
2021-08-18 10:02 ` Phillip Wood
2021-08-18 22:45 ` Philippe Blain
2021-08-19 10:04 ` Phillip Wood
2021-08-30 21:21 ` Josh Steadmon
2021-08-25 19:40 ` Junio C Hamano
2021-08-30 21:46 ` [PATCH v3] " Josh Steadmon
2021-08-30 22:21 ` Junio C Hamano [this message]
2021-08-30 23:40 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr1ea1sm7.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=steadmon@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.