From: Stephen Bash <bash@genarts.com>
To: Matthew Caron <Matt.Caron@redlion.net>
Cc: Enrico Weigelt <enrico.weigelt@vnc.biz>, git@vger.kernel.org
Subject: Re: diff/merge tool that ignores whitespace changes
Date: Tue, 28 Aug 2012 14:08:14 -0400 (EDT) [thread overview]
Message-ID: <1897335562.100848.1346177294831.JavaMail.root@genarts.com> (raw)
In-Reply-To: <503D02DF.3030802@redlion.net>
----- Original Message -----
> From: "Matthew Caron" <Matt.Caron@redlion.net>
> Sent: Tuesday, August 28, 2012 1:41:51 PM
> Subject: Re: diff/merge tool that ignores whitespace changes
>
> > > I'm looking for a diff / merge tool that treats lines with only
> > > whitespace changes (trailing or leading whitespaces, linefeeds,
> > > etc) as equal.
> > >
> > > The goal is to make reviews as well as merging or rebasing easier
> > > when things like indentions often change.
> > >
> > > Does anybody know an solution for that ?
>
> I'm fond of Meld.
I loved Meld when I was working exclusively on Linux several years ago. Honestly I think I set up my kdiff fonts/highlight colors/etc. to be very Meld-like (unintentionally, just what "looked right"). Looking at the website, technically Meld should build/run on a variety of OSes, but at some point (lost to the sands of time) I ran into trouble which is why I switched.
Stephen
next prev parent reply other threads:[~2012-08-28 18:08 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 [this message]
2012-09-01 20:11 ` Enrico Weigelt
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=1897335562.100848.1346177294831.JavaMail.root@genarts.com \
--to=bash@genarts.com \
--cc=Matt.Caron@redlion.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.