git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: Enrico Weigelt <enrico.weigelt@vnc.biz>
Cc: git@vger.kernel.org
Subject: Re: diff/merge tool that ignores whitespace changes
Date: Sat, 01 Sep 2012 22:41:20 +0200	[thread overview]
Message-ID: <504272F0.3070701@web.de> (raw)
In-Reply-To: <fab86cd5-e3cf-4ddf-aa00-aafe44e8ce8c@zcs>

On 01.09.12 22:11, Enrico Weigelt wrote:
> 
> <snip>
> 
> Thanks folks, but that doesn't solve my problem. I'm looking for something
> that's usable on command line or in scripts.
> 
> Usecase a)
> 
> * git-diff or git-format-patch or tig should not show differences
>   that are only whitespace changes (eg. differing linefeeds or
>   tabs vs. spaces, changed indentions, etc)

Would that help ?
git help diff
[snip]
     --ignore-space-at-eol
           Ignore changes in whitespace at EOL.

       -b, --ignore-space-change
           Ignore changes in amount of whitespace. This ignores whitespace at
           line end, and considers all other sequences of one or more
           whitespace characters to be equivalent.

       -w, --ignore-all-space
           Ignore whitespace when comparing lines. This ignores differences
           even if one line has whitespace where the other line has none.

  reply	other threads:[~2012-09-01 20:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <c58cfa61-84c0-4bbe-80a6-59f156317007@zcs>
2012-08-28 16:26 ` diff/merge tool that ignores whitespace changes Enrico Weigelt
2012-08-28 17:40   ` Stephen Bash
2012-08-28 17:41     ` Matthew Caron
2012-08-28 18:08       ` Stephen Bash
2012-09-01 20:11     ` Enrico Weigelt
2012-09-01 20:41       ` Torsten Bögershausen [this message]
2012-09-02 21:07         ` Enrico Weigelt
2012-09-03 20:40           ` Jonas Fonseca
2012-09-01 21:09       ` Andreas Schwab

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=504272F0.3070701@web.de \
    --to=tboegi@web.de \
    --cc=enrico.weigelt@vnc.biz \
    --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.
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).