git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Marius Storm-Olsen <mstormo@gmail.com>
To: git@vger.kernel.org
Subject: git rebase -p doesn't understand -X
Date: Fri, 15 Apr 2011 12:21:24 -0500	[thread overview]
Message-ID: <4DA87E94.2050700@gmail.com> (raw)

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

             reply	other threads:[~2011-04-15 17:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-15 17:21 Marius Storm-Olsen [this message]
2011-04-19  9:06 ` git rebase -p doesn't understand -X Martin von Zweigbergk
2011-04-20 23:40   ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4DA87E94.2050700@gmail.com \
    --to=mstormo@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).