From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, 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>
Subject: Re: [RFC/PATCH] cherry-pick/revert: add support for -X/--strategy-option
Date: Fri, 10 Dec 2010 20:35:37 -0600 [thread overview]
Message-ID: <20101211023537.GA12161@burratino> (raw)
In-Reply-To: <7vvd319h50.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>> $ git revert -Xrenormalize old-problematic-commit
[...]
> I guess this can also take "ignore whitespace", which might be a better
> option for this particular use case?
Suppose in olden days you checked in files with \r\n line endings and
now you have switched to \n (attribute "crlf" or "text"), and in
between there was a day in which the line endings were switched.
Now you notice that old-problematic-commit is broken. If that commit
removed lines (which had \r\n line endings), then even with
-Xignore-space-at-eol, "git revert" will add them back verbatim. By
contrast, "git revert -Xrenormalize" would add them back in such a way
as to follow the current line ending style.
next prev parent reply other threads:[~2010-12-11 2:36 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 [this message]
2010-12-27 21:25 ` Jonathan Nieder
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=20101211023537.GA12161@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).