Re: diff/merge tool that ignores whitespace changes

<snip>

Thanks folks, but that doesn't solve my problem. I'm looking for something that's usable on command line or in scripts.

Usecase a)

* git-diff or git-format-patch or tig should not show differences
  that are only whitespace changes (eg. differing linefeeds or
  tabs vs. spaces, changed indentions, etc)

Usecase b)

* when doing merges or rebases, changes in whitespaces only should be
  either ignored or resolved fully automtically.
* For example:
  -> A changes spaces into tabs or adds leading/trailing spaces
  -> B changes some non-spaces 

cu