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

New `--reapply-cherry-picks` warning

From
ΣΝΣταύρος Ντέντος <stdedos@gmail.com>
Date
Feb 2, 2022, 08:56 UTC
Message-ID
<CAHMHMxUZpR8MBj+9mSb1Cr3PBCsAx=6zLo9mKpeD_ehqDP4nvQ@mail.gmail.com>
Hello there,

I have noticed the new warning that's coming in the https://github.com/git/git/commit/767a4ca648f8791c1fb623bd9f79fd8d7f026499

I am currently using the `[pull] rebase = true` option; and basically that warning is also coming every time I am pulling. I have tried doing `git pull --reapply-cherry-picks`; however, it seems that the `git pull` cannot pass options to the underlying `git rebase` invocation.

I noticed that there is no way to "set" the `--reapply-cherry-picks` in the gitconfig options.

I prefer the rebase backend for the `git pull`; however, I see no way of doing "what I want", with the exception of: git fetch --all ; git rebase --reapply-cherry-picks

Which is two steps, technically.

Also with every rebase I am doing, I'd have to remember that. And it is probably not possible (by design) to do `alias.rebase = rebase --reapply-cherry-picks` - which I understand. (however, allowing aliases like `alias.x = x --cmd-opts` does not sound "so bad" with me)

Would you consider adding a configuration option for the `--reapply-cherry-picks`?

With regards, Ntentos Stavros

Next: Philippe Blain
Message 1 of 3 in “New `--reapply-cherry-picks` warning”
  1. Σταύρος ΝτέντοςFeb 2, 2022
  2. Philippe BlainFeb 2, 2022
  3. Σταύρος ΝτέντοςFeb 2, 2022

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.