From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2 3/3] status: mention --skip for revert and cherry-pick
Date: Tue, 27 Aug 2019 19:47:33 -0700 [thread overview]
Message-ID: <xmqqwoey0zwa.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqef162rx2.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Tue, 27 Aug 2019 14:56:57 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> 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?
Addendum.
"rebase" (especially with "-i") is fundamentally different from
"cherry-pick" and it makes tons of sense to suggest "--skip" in the
former. "rebase -i" is a tool to take a messy work in progress and
polish it by reordering, discarding and combining commits.
"cherry-pick" is to take a finished work already in one integration
track, and transplant to another, often an older maintenance track,
and there is no place for "this conflict is too much to resolve so
let's drop it".
next prev parent reply other threads:[~2019-08-28 2:47 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
2019-08-28 2:47 ` Junio C Hamano [this message]
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:
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=xmqqwoey0zwa.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.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 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 NNTP newsgroup(s).