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

git rebase -p doesn't understand -X

From
Marius Storm-Olsen <mstormo@gmail.com>
Date
Apr 15, 2011, 17:21 UTC
Message-ID
<4DA87E94.2050700@gmail.com>
Hi,

I'm trying to rebase a rather large series of patches, which also contains a couple of merges which I'd like to recreate in the rebase, and for the other conflicts I'd like git to automatically choose 'ours'.

So, I run
     git rebase -p -X ours -X patience -X ignore-all-space --onto foo 
bar baz
and I get
     error: unknown switch `X'

Clearly this is because when you use the -p option, everything goes through the --interactive engine, instead of the normal procedure. I would still like to maintain that this is a bug, and that even though -p uses a different engine, to be able to recreate the merges, it should still be able to let me tune the overall merge strategy.

Is there any work around to allow me to achieve the same result?
Thanks!
-- 
.marius
Next: Martin von Zweigbergk
Message 1 of 3 in “git rebase -p doesn't understand -X”
  1. Marius Storm-OlsenApr 15, 2011
  2. Martin von ZweigbergkApr 19, 2011
  3. Jonathan NiederApr 20, 2011

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.