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 27, 2019, 21:56 UTC
Message-ID
<xmqqef162rx2.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<be64ce1e92c60f9587b137d36e98532604d4a1ff.1566880835.git.liu.denton@gmail.com>
Denton Liu <liu.denton@gmail.com> 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?

Previous: Denton LiuNext: Denton Liu
Message 9 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.