git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: diff/merge tool that ignores whitespace changes

From
SBStephen Bash <bash@genarts.com>
Date
Aug 28, 2012, 17:40 UTC
Message-ID
<1679275990.100371.1346175639379.JavaMail.root@genarts.com>
In-Reply-To
<12945e4d-6a76-4c5d-a4ee-132552a5da4d@zcs>
----- Original Message -----
Show 12 quoted lines
> From: "Enrico Weigelt" <enrico.weigelt@vnc.biz>
> Sent: Tuesday, August 28, 2012 12:26:39 PM
> Subject: 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 use kdiff3 which has the option to ignore whitespace changes (bonus: I can use it on all three major OSes as my work requires).  It's GUI based, so that could be considered a downside to some.
I usually use a combination of Git's built-in diff and kdiff to check my work.

HTH, Stephen

Previous: Enrico WeigeltNext: Matthew Caron
Message 2 of 9 in “diff/merge tool that ignores whitespace changes”
  1. Enrico WeigeltAug 28, 2012
  2. Stephen BashAug 28, 2012
  3. Matthew CaronAug 28, 2012
  4. Stephen BashAug 28, 2012
  5. Enrico WeigeltSep 1, 2012
  6. Torsten BögershausenSep 1, 2012
  7. Enrico WeigeltSep 2, 2012
  8. Jonas FonsecaSep 3, 2012
  9. Andreas SchwabSep 1, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.