{"thread":{"id":"16270","subject":"git rebase --whitespace","startedAt":"2008-11-11T14:12:50Z","lastAt":"2008-11-11T14:12:50Z","messageCount":1,"participants":["Patrick Ohly"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"95458","messageId":"1226412770.17450.839.camel@ecld0pohly","threadId":"16270","inReplyTo":null,"subject":"git rebase --whitespace","fromName":"Patrick Ohly","fromEmail":"patrick.ohly@intel.com","sentAt":"2008-11-11T14:12:50Z","receivedAt":"2008-11-11T14:12:50Z","isPatch":false,"sender":{"key":"patrick.ohly@intel.com","avatar":null},"body":"Hello!\n\nI tried to use \"git --rebase --whitespace=...\" and noticed some\noddities. Git 1.6.0.4.\n\n      * --whitespace is not supported when using --interactive. Should\n        be mentioned in the docs.\n      * Without --interactive, rebase will bail out early if the current\n        branch is up-to-date. I was trying to use --whitespace=fix to\n        clean up my patches and had to patch git-rebase (see attached),\n        otherwise it didn't let me do that.\n      * The documentation mentions --whitespace=check, but \"check\" is\n        not a valid option.\n\nI don't have time to fix the documentation, but I thought I should at\nleast mention the issues and send the patch your way in case someone\nfinds it useful.\n\n-- \nBest Regards, Patrick Ohly\n\nThe content of this message is my personal opinion only and although\nI am an employee of Intel, the statements I make here in no way\nrepresent Intel's position on the issue, nor am I authorized to speak\non behalf of Intel on this matter.\n\n\n--- git-1.6.0.4/git-rebase.sh\t2008-11-09 07:53:38.000000000 +0100\n+++ git-1.6.0.4/git-rebase.sh.patched\t2008-11-11 15:10:27.000000000 +0100\n@@ -375,6 +375,7 @@\n # but this should be done only when upstream and onto are the same.\n mb=$(git merge-base \"$onto\" \"$branch\")\n if test \"$upstream\" = \"$onto\" && test \"$mb\" = \"$onto\" &&\n+        ! (echo $git_am_opt | grep -e --whitespace ) > /dev/null &&\n \t# linear history?\n \t! (git rev-list --parents \"$onto\"..\"$branch\" | grep \" .* \") > /dev/null\n then\n"}]}