Ignore *all* whitespace changes with git-diff between commits

by

Perhaps there is a better answer, but the best solution I’ve found so far is this.

First, you must control the definition of “whitespace” that Git is currently using.

git config core.whitespace '-trailing-space,-indent-with-non-tab,-tab-in-indent'

Next, you must control the definition of a word used. Instead of just using git diff -w, add --word-diff-regex='[^[:space:]]':

git diff -w --word-diff-regex='[^[:space:]]'

You’ll still see the context, which (in my case, since I’m trying to ensure that there are no differences except whitespace differences) is not helpful. You can use -U0 to tell Git to give you 0 lines of context, like so,

git diff -w -U0 --word-diff-regex='[^[:space:]]'

but you’ll still get output that looks pretty much like context, but it’s still much better than looking through all the changes carefully and manually to make sure they are only whitespace changes.

You can also do all the above in one command. The -c flag changes git config just for one command.

git -c core.whitespace=-trailing-space,-indent-with-non-tab,-tab-in-indent diff -U0 --word-diff-regex='[^[:space:]]'

More Related Contents:

  1. How do I show the changes which have been staged?
  2. How can I see the changes in a Git commit?
  3. What are the differences between double-dot “..” and triple-dot “…” in Git diff commit ranges? [duplicate]
  4. How to read the output from git diff?
  5. git-diff to ignore ^M
  6. How can I get the diff between all the commits that occurred between two dates with Git?
  7. How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?
  8. Make ‘git diff’ ignore ^M
  9. Exclude file from “git diff”
  10. Show git diff, ignoring file permission changes?
  11. Using git diff, how can I get added and modified lines numbers?
  12. How to make ‘git diff’ ignore comments
  13. Can I make git recognize a UTF-16 file as text?
  14. git diff – show me line ending changes?
  15. ‘git diff’ doesn’t show enough
  16. How do I see the differences between two branches?
  17. Can I use git diff on untracked files?
  18. Filter git diff by type of change
  19. Trying to understand `git diff` and `git mv` rename detection mechanism
  20. Where does the excerpt in the git diff hunk header come from?
  21. Show diff between commits
  22. There isn’t anything to compare. Nothing to compare, branches are entirely different commit histories
  23. How resolve multiple conflicts with “git mergetool” without having to close the editor between files?
  24. How can I get a side-by-side diff when I do “git diff”?
  25. What does the “@@…@@” meta line with at signs in svn diff or git diff mean?
  26. Viewing all `git diffs` with vimdiff
  27. How to diff a commit with its parent
  28. How to apply `git diff` patch without Git installed?
  29. Diffing between two entire directories/projects in hg or git?
  30. What are the differences between these git diff commands?

Leave a Comment