diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-25 11:34:47 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-26 00:56:21 +0400 |
commit | c921cc92e5ff2ead4dea112b19e555f521cf20b8 (patch) | |
tree | 01ff0c87b548ae08210ceead09dc5f2143810ec1 /Documentation/config.txt | |
parent | a2d07d80ec9dfff0e51cac534be7c1642a47f8fb (diff) |
Documentation: clarify how to disable elements in core.whitespace
Noticed by Peter Valdemar Mørch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index e7848055a9..798b551514 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -358,7 +358,8 @@ core.whitespace:: A comma separated list of common whitespace problems to notice. 'git-diff' will use `color.diff.whitespace` to highlight them, and 'git-apply --whitespace=error' will - consider them as errors: + consider them as errors. You can prefix `-` to disable + any of them (e.g. `-trailing-space`): + * `trailing-space` treats trailing whitespaces at the end of the line as an error (enabled by default). |