All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Josh Steadmon <steadmon@google.com>, git@vger.kernel.org
Subject: Re: [RFC PATCH] sequencer: warn on skipping previously seen commit
Date: Thu, 05 Aug 2021 09:30:02 -0700	[thread overview]
Message-ID: <xmqqpmurlur9.fsf@gitster.g> (raw)
In-Reply-To: <d3f6eb6c-f2e4-b00c-3b4c-bf1e04c846b4@gmail.com> (Phillip Wood's message of "Thu, 5 Aug 2021 11:13:40 +0100")

Phillip Wood <phillip.wood123@gmail.com> writes:

>>> +	if (skipped_commit)
>>> +		warning(_("use --reapply-cherry-picks to include skipped commits"));
>> I'd be hesitant to endorse doing this kind of "here is how to use
>> this command" unconditionally.  Perhaps under --verbose, or hide it
>> under "advise.*".
>
> and use advise() rather than warning(). I'm guess this might be
> helpful but it wont help them get their commits back as there is no
> way to stop the rebase from dropping them at that point.

Yes, but aborting the current rebase and redoing from scratch should
not be a brain surgery.  Even if you had already resolved conflicts
in earlier steps, the work will be replayed automatically for you by
the rerere mechanism.

  reply	other threads:[~2021-08-05 16:30 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 [this message]
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
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=xmqqpmurlur9.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --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.