From: Junio C Hamano <gitster@pobox.com>
To: layer <layer@known.net>
Cc: git@vger.kernel.org
Subject: Re: git merge ignoring whitespace
Date: Thu, 05 Feb 2009 15:44:20 -0800 [thread overview]
Message-ID: <7vtz78a1pn.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 2754.1233876289@relay.known.net
layer <layer@known.net> writes:
> Junio, on 3/25/07 you said:
>
> I know Linus does not like applying patches with whitespace
> fuzziness, but I personally think a merge that ignores
> whitespace changes would be a useful thing to have, without
> having to call an external specialized merge backend. In other
> words, I do not think it is so special a thing to want to, but
> it is rather an unfortunate norm. I am not opposed to give
> git-merge-recursive a command line option to tell it to merge
> ignoring the whitespace-only changes, when it does the 3-way
> file-level merge internally.
>
> Whatever came of this?
I do not know. When I say "I am not opposed to", I mean just that.
I may consider it a bad mode of operation, and I may hesitate to encourage
people to use it as their default. But I do not feel strongly enough to
veto it---as long as it is a rope you need to explicitly ask for to hang
yourself with, I think it is Ok if we allowed such an option.
It is not my itch to scratch, and I do not keep track.
Did you submit a patch that implements the new feature cleanly?
next prev parent reply other threads:[~2009-02-05 23:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-05 23:24 git merge ignoring whitespace layer
2009-02-05 23:44 ` Junio C Hamano [this message]
2009-02-05 23:48 ` layer
2009-02-13 1:38 ` Johannes Schindelin
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=7vtz78a1pn.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=layer@known.net \
/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).