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

Re: [PATCH v3] sequencer: advise if skipping cherry-picked commit

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 30, 2021, 22:21 UTC
Message-ID
<xmqqr1ea1sm7.fsf@gitster.g>
In-Reply-To
<691c660422676c92180feb1c2a88049afe7536b9.1630359271.git.steadmon@google.com>
Josh Steadmon <steadmon@google.com> writes:
Show 12 quoted lines
> Silently skipping commits when rebasing with --no-reapply-cherry-picks
> (currently the default behavior) can cause user confusion. Issue
> warnings when this happens, as well as advice on how to preserve the
> skipped commits.
>
> These warnings and advice are displayed only when using the (default)
> "merge" rebase backend.
>
> Update the git-rebase docs to mention the warnings and advice.
>
> Signed-off-by: Josh Steadmon <steadmon@google.com>
> ---
Looks sensible.

Will queue. Let's merge it down to 'next' in a few days and leave the follow-on work to later.

Thanks.
Previous: Josh SteadmonNext: Junio C Hamano
Message 17 of 18 in “sequencer: warn on skipping previously seen commit”
  1. sequencer: warn on skipping previously seen commitJosh Steadmon, Aug 4, 2021
  2. Junio C HamanoAug 4, 2021
  3. Phillip WoodAug 5, 2021
  4. Junio C HamanoAug 5, 2021
  5. sequencer: advise if skipping cherry-picked commitJosh Steadmon, Aug 10, 2021
  6. Junio C HamanoAug 10, 2021
  7. Phillip WoodAug 18, 2021
  8. Josh SteadmonAug 30, 2021
  9. Philippe BlainAug 12, 2021
  10. Junio C HamanoAug 12, 2021
  11. Phillip WoodAug 18, 2021
  12. Philippe BlainAug 18, 2021
  13. Phillip WoodAug 19, 2021
  14. Josh SteadmonAug 30, 2021
  15. Junio C HamanoAug 25, 2021
  16. sequencer: advise if skipping cherry-picked commitJosh Steadmon, Aug 30, 2021
  17. Junio C HamanoAug 30, 2021
  18. Junio C HamanoAug 30, 2021

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.