mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Denton Liu <>
To: Junio C Hamano <>
Cc: Git Mailing List <>
Subject: Re: [PATCH v2 3/3] status: mention --skip for revert and cherry-pick
Date: Tue, 27 Aug 2019 19:18:27 -0400	[thread overview]
Message-ID: <20190827231827.GA26899@archbookpro.localdomain> (raw)
In-Reply-To: <>

On Tue, Aug 27, 2019 at 02:56:57PM -0700, Junio C Hamano wrote:
> Denton Liu <> writes:
> > When reverting or cherry-picking, one of the options we can pass the
> > sequencer is `--skip`. However, unlike rebasing, `--skip` is not
> > mentioned as a possible option in the status message. Mention it so that
> > users are more aware of their options.
> Is this a good thing, though?
> Giving up (because you do not have enough time or concentration to
> finish the cherry-pick or revert in progress) with --abort, and
> committing to the resolution after spending effort to deal with a
> conflicted cherry-pick or revert with --continue, are both sensible
> actions after seeing the command stop due to conflicts.  Is "--skip"
> a recommendable action in the same way?  Doesn't a multi-commit
> series often break if you drop just one in the middle, especially
> if the series is sensibly structured as a logical progression?

I think that the same argument for or against recommending `--skip`
could be made for rebases as well. However, in the rebase case, `--skip`
is recommended whenever `--abort` is recommended. With this patch, I
made it so that revert and cherry-pick would have `--skip` and `--abort`
paired as well.

I'm pretty impartial about making this change but I would suggest if we
choose not to pursue this then we should also drop the `--skip`
recommendation from rebase as well.

  reply	other threads:[~2019-08-27 23:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-24  9:04 [PATCH 0/2] completion: complete --skip for cherry-pick and revert Denton Liu
2019-08-24  9:04 ` [PATCH 1/2] completion: merge options " Denton Liu
2019-08-26 16:59   ` Junio C Hamano
2019-08-24  9:04 ` [PATCH 2/2] completion: add --skip " Denton Liu
2019-08-27  4:45 ` [PATCH v2 0/3] advertise --skip for cherry-pick and revert better Denton Liu
2019-08-27  4:45   ` [PATCH v2 1/3] completion: merge options for cherry-pick and revert Denton Liu
2019-08-27  4:45   ` [PATCH v2 2/3] completion: add --skip " Denton Liu
2019-08-27  4:45   ` [PATCH v2 3/3] status: mention --skip for revert and cherry-pick Denton Liu
2019-08-27 21:56     ` Junio C Hamano
2019-08-27 23:18       ` Denton Liu [this message]
2019-08-28  2:47       ` Junio C Hamano
2019-08-28  6:45         ` Denton Liu

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190827231827.GA26899@archbookpro.localdomain \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).