X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=d8696b7b36ff81f47214da9d7c4ec53142b97653;hb=5a27b3211a37ca283738c3f114e8123393d1518a;hp=da1cc60e970027bec50c484e1db5717ec90eb150;hpb=e8b4029f990907e24fac0e7772ee19ee6dd55c1c;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index da1cc60e9..d8696b7b3 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -58,6 +58,10 @@ Turn off rename detection, even when the configuration file gives the default to do so. +--check:: + Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. + --full-index:: Instead of the first handful characters, show full object name of pre- and post-image blob on the "index" @@ -136,6 +140,9 @@ -a:: Shorthand for "--text". +--ignore-space-at-eol:: + Ignore changes in white spaces at EOL. + --ignore-space-change:: Ignore changes in amount of white space. This ignores white space at line end, and consider all other sequences of one or