git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 3/3] status: mention --skip for revert and cherry-pick

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 28, 2019, 02:47 UTC
Message-ID
<xmqqwoey0zwa.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<xmqqef162rx2.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 10 quoted lines
> 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".

Previous: Denton LiuNext: Denton Liu
Message 11 of 12 in “completion: complete --skip for cherry-pick and revert”
  1. 0/2 completion: complete --skip for cherry-pick and revertDenton Liu, Aug 24, 2019
  2. 2/2 completion: add --skip for cherry-pick and revertDenton Liu, Aug 24, 2019
  3. 1/2 completion: merge options for cherry-pick and revertDenton Liu, Aug 24, 2019
  4. Junio C HamanoAug 26, 2019
  5. 0/3 advertise --skip for cherry-pick and revert betterDenton Liu, Aug 27, 2019
  6. 1/3 completion: merge options for cherry-pick and revertDenton Liu, Aug 27, 2019
  7. 2/3 completion: add --skip for cherry-pick and revertDenton Liu, Aug 27, 2019
  8. 3/3 status: mention --skip for revert and cherry-pickDenton Liu, Aug 27, 2019
  9. Junio C HamanoAug 27, 2019
  10. Denton LiuAug 27, 2019
  11. Junio C HamanoAug 28, 2019
  12. Denton LiuAug 28, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.