summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-25 00:34:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-25 13:56:21 -0700
commitc921cc92e5ff2ead4dea112b19e555f521cf20b8 (patch)
tree01ff0c87b548ae08210ceead09dc5f2143810ec1 /Documentation
parentdocument that git-tag can tag more than heads (diff)
downloadtgif-c921cc92e5ff2ead4dea112b19e555f521cf20b8.tar.xz
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')
-rw-r--r--Documentation/config.txt3
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).