diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-14 21:42:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-14 21:42:53 -0800 |
| commit | dfaf75b4698833d820e77e9f42ef93f3b6d3669d (patch) | |
| tree | af298a982053033eab62dcff0650d3eb18b37cc6 /Documentation | |
| parent | d7e92806cdc5ca78c4db879c68f91c70ff9e1ade (diff) | |
| parent | 5973a07937f2c64b595c6784b06eb4441c07b5ef (diff) | |
| download | git-dfaf75b4698833d820e77e9f42ef93f3b6d3669d.tar.gz git-dfaf75b4698833d820e77e9f42ef93f3b6d3669d.tar.xz | |
Merge branch 'wc/diff'
* wc/diff:
Test interaction between diff --check and --exit-code
Use shorter error messages for whitespace problems
Add tests for "git diff --check" with core.whitespace options
Make "diff --check" output match "git apply"
Unify whitespace checking
diff --check: minor fixups
"diff --check" should affect exit status
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 5d22b7b58..9ecc1d7bc 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -93,7 +93,9 @@ endif::git-format-patch[] --check:: Warn if changes introduce trailing whitespace - or an indent that uses a space before a tab. + or an indent that uses a space before a tab. Exits with + non-zero status if problems are found. Not compatible with + --exit-code. --full-index:: Instead of the first handful characters, show full |