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

Re: diff/merge tool that ignores whitespace changes

From
Enrico Weigelt <enrico.weigelt@vnc.biz>
Date
Sep 2, 2012, 21:07 UTC
Message-ID
<4eab55d2-b504-4c66-84be-c1ffe4edf94c@zcs>
In-Reply-To
<504272F0.3070701@web.de>
Hi,
Show 17 quoted lines
> Would that help ?
> git help diff
> [snip]
>      --ignore-space-at-eol
>            Ignore changes in whitespace at EOL.
> 
>        -b, --ignore-space-change
>            Ignore changes in amount of whitespace. This ignores
>            whitespace at
>            line end, and considers all other sequences of one or more
>            whitespace characters to be equivalent.
> 
>        -w, --ignore-all-space
>            Ignore whitespace when comparing lines. This ignores
>            differences
>            even if one line has whitespace where the other line has
>            none.

That might be it :) Now I yet need to find out how to configure tig for it.

By the way: anything similar for merge/rebase ?
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 
Previous: Torsten BögershausenNext: Jonas Fonseca
Message 7 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.