Quoting Giuseppe Bilotta <giuseppe.bilotta@xxxxxxxxx> >> Perhaps --ignore-space-change, to be consistent with a "git diff" option, >> would be more appropriate. Doing so has an added benefit of leaving the >> door open to add --ignore-all-space option to the patch application side >> later. > > On the other hand, --ignore-whitespace matches the option name (and > behavior) of the 'patch' command (just like "git diff"'s matches the > 'diff' option name and behavior). Principle of least surprise says > that someone coming to git from raw diff/patch setups would expect > --ignore-whitespace on the patch side. Not everybody shares your diff/patch background. I wouldn't be surprised if git were the first system they ever learn for majority of users of version control systems in this century, especially because now there are many books written on it. Isn't it more important for git to be internally consistent across its commands for such an audience to satisfy the principle of least surprise? -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html