X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=1689c748171a8ff48395cf432aabe0130fc6b8d2;hb=3a81b9f571a6b7edd83b3d5f27c3c95d9b1c9d5c;hp=da1cc60e970027bec50c484e1db5717ec90eb150;hpb=240897e908e48e8f8c8d5555522afe255b3b734b;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index da1cc60e9..1689c7481 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 @@ -152,5 +159,13 @@ -w:: Shorthand for "--ignore-all-space". +--exit-code:: + Make the program exit with codes similar to diff(1). + That is, it exits with 1 if there were differences and + 0 means no differences. + +--quiet:: + Disable all output of the program. Implies --exit-code. + For more detailed explanation on these common options, see also link:diffcore.html[diffcore documentation].