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

diff/merge tool that ignores whitespace changes

From
Enrico Weigelt <enrico.weigelt@vnc.biz>
Date
Aug 28, 2012, 16:26 UTC
Message-ID
<12945e4d-6a76-4c5d-a4ee-132552a5da4d@zcs>
In-Reply-To
<c58cfa61-84c0-4bbe-80a6-59f156317007@zcs>
Hi folks,

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 ?
thx
-- 
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: Stephen Bash
Message 1 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.