From: Enrico Weigelt <enrico.weigelt@vnc.biz>
Date: Sat, 01 Sep 2012 20:11:13 GMT
Subject: Re: diff/merge tool that ignores whitespace changes
Message-ID: <fab86cd5-e3cf-4ddf-aa00-aafe44e8ce8c@zcs>
In-Reply-To: <1679275990.100371.1346175639379.JavaMail.root@genarts.com>


<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)

Usecase b)

* when doing merges or rebases, changes in whitespaces only should be
  either ignored or resolved fully automtically.
* For example:
  -> A changes spaces into tabs or adds leading/trailing spaces
  -> B changes some non-spaces 

cu
-- 
Mit freundlichen Grüßen / Kind regards 

Enrico Weigelt 
VNC - Virtual Network Consult GmbH 
Head Of Development 

Pariser Platz 4a, D-10117 Berlin
Tel.: +49 (30) 3464615-20
Fax: +49 (30) 3464615-59

enrico.weigelt@vnc.biz; www.vnc.de