From: Enrico Weigelt <enrico.weigelt@vnc.biz>
To: git@vger.kernel.org
Subject: Re: diff/merge tool that ignores whitespace changes
Date: Sat, 01 Sep 2012 22:11:13 +0200 (CEST) [thread overview]
Message-ID: <fab86cd5-e3cf-4ddf-aa00-aafe44e8ce8c@zcs> (raw)
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
next prev parent reply other threads:[~2012-09-01 20:12 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 [this message]
2012-09-01 20:41 ` Torsten Bögershausen
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=fab86cd5-e3cf-4ddf-aa00-aafe44e8ce8c@zcs \
--to=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).