From: Junio C Hamano <gitster@pobox.com>
To: "Nguyen Thai Ngoc Duy" <pclouds@gmail.com>
Cc: "Dirk Süsserott" <newsletter@dirk.my1.cc>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: git-diff cr/nl files on linux
Date: Sun, 25 May 2008 21:37:10 -0700 [thread overview]
Message-ID: <7vskw5el55.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <fcaeb9bf0805252115q60f784aax6b1f267c476960b4@mail.gmail.com> (Nguyen Thai Ngoc Duy's message of "Mon, 26 May 2008 11:15:10 +0700")
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com> writes:
> On Sat, May 24, 2008 at 8:01 PM, Dirk Süsserott <newsletter@dirk.my1.cc> wrote:
> ...
>> What about 'git diff -w'? It drops any whitespace changes, including ^M's.
>> Not sure whether that is what you meant.
>
> That won't help.
Just like GNU diff, the only thing -w (and -b) does is to omit hunks whose
changes consist of _only whitespace changes_ and nothing else.
In your quoted example, you have changes other than whitespace changes, so
it is unsurprising that you will see the whole change, together with your
whitespace changes.
next prev parent reply other threads:[~2008-05-26 4:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-24 12:54 git-diff cr/nl files on linux Nguyen Thai Ngoc Duy
2008-05-24 13:01 ` Dirk Süsserott
2008-05-26 4:15 ` Nguyen Thai Ngoc Duy
2008-05-26 4:37 ` Junio C Hamano [this message]
2008-05-26 6:34 ` Johannes Sixt
2008-05-26 8:04 ` Nguyen Thai Ngoc Duy
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=7vskw5el55.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newsletter@dirk.my1.cc \
--cc=pclouds@gmail.com \
/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).