diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-23 01:01:18 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-23 01:01:18 +0400 |
| commit | def98035d00c57bb8723e7859366536504eb56aa (patch) | |
| tree | 2f25c86607372632a845313f4e6ddea782c79440 /Documentation/diff-options.txt | |
| parent | 2765233c64c35eb43a8b46c377fb8b464469221f (diff) | |
| parent | 4f8303905eafaa04fd08a20a08a81436aea2d4b9 (diff) | |
Merge branch 'maint'
* maint:
Documentation: git diff --check respects core.whitespace
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c7ed946357..24f189f96b 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -224,10 +224,14 @@ endif::git-format-patch[] ifndef::git-format-patch[] --check:: - Warn if changes introduce trailing whitespace - or an indent that uses a space before a tab. Exits with - non-zero status if problems are found. Not compatible with - --exit-code. + Warn if changes introduce whitespace errors. What are + considered whitespace errors is controlled by `core.whitespace` + configuration. By default, trailing whitespaces (including + lines that solely consist of whitespaces) and a space character + that is immediately followed by a tab character inside the + initial indent of the line are considered whitespace errors. + Exits with non-zero status if problems are found. Not compatible + with --exit-code. endif::git-format-patch[] --full-index:: |