threads / discuss / 15029

Ignoring whitespace for diff and rebase

Subject: Ignoring whitespace for diff and rebase

## tl;dr

One message between Aug 15, 2008 and Aug 15, 2008.

replies: 0people: 1as markdown or json

Lars Noschinski· Aug 15, 2008, 18:59 UTC · lore
Hello!
Sometimes, I use
     git diff -b > ~/tmp/patch
     git reset --hard HEAD
     git apply ~/tmp/patch

to clean up all only-whitespace changes. But if there are files which only differ on whitespace, git-diff produces an empty patch block (what's the correct name for it?) like

     diff --git a/hello b/hello
     index f2aa86d..ce01362 100644

which git-apply refuses to apply. Is this behaviour of git-diff intentional or should I try to cook up a patch?

Another combination which does not for for me is --interactive and --whitespace for rebase:

     > git rebase -i --whitespace=strip HEAD^
     fatal: Needed a single revision
     Invalid base

Is this an implementation bug or lack of a note of incompatibility in the docs?

← back to recent threads