git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Christian Couder <chriscool@tuxfamily.org>,
	Justin Frankel <justin@cockos.com>,
	Bert Wesarg <bert.wesarg@googlemail.com>,
	Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
	Kevin Ballard <kevin@sb.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC/PATCH] cherry-pick/revert: add support for -X/--strategy-option
Date: Mon, 27 Dec 2010 15:25:15 -0600	[thread overview]
Message-ID: <20101227212515.GA32352@burratino> (raw)
In-Reply-To: <20101211005144.GA6634@burratino>

Jonathan Nieder wrote:

> For example, this would allow cherry-picking or reverting patches from
> a piece of history with a different end-of-line style, like so:
> 
> 	$ git revert -Xrenormalize old-problematic-commit
> 
> Currently that is possible with manual use of merge-recursive but the
> cherry-pick/revert porcelain does not expose the functionality.
> 
> While at it, document the existing support for --strategy.
> 
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
> Thoughts?

Ping?  I use this with -Xpatience fairly often.  Am I the only one who
has wanted such a thing?

  parent reply	other threads:[~2010-12-27 21:25 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-11  0:51 [RFC/PATCH] cherry-pick/revert: add support for -X/--strategy-option Jonathan Nieder
2010-12-11  2:29 ` Junio C Hamano
2010-12-11  2:35   ` Jonathan Nieder
2010-12-27 21:25 ` Jonathan Nieder [this message]
2010-12-27 15:38   ` Martin von Zweigbergk
2010-12-27 22:07   ` Justin Frankel
2010-12-28 17:45   ` Junio C Hamano
2010-12-28 19:37     ` 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

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

  git send-email \
    --in-reply-to=20101227212515.GA32352@burratino \
    --to=jrnieder@gmail.com \
    --cc=bert.wesarg@googlemail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=eyvind.bernhardsen@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=justin@cockos.com \
    --cc=kevin@sb.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.
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 NNTP newsgroup(s).