Ignoring whitespace for diff and rebase
- From
- Lars Noschinski <lars-2008-1@usenet.noschinski.de>
- Date
- Aug 15, 2008, 18:59 UTC
- Message-ID
- <20080815185920.GA3646@lars.home.noschinski.de>
Hello!
Sometimes, I use
git diff -b > ~/tmp/patch
git reset --hard HEAD
git apply ~/tmp/patchto 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 100644which 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 baseIs this an implementation bug or lack of a note of incompatibility in the docs?