From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Jul 2008 07:34:47 +0000 (-0700)
Subject: Documentation: clarify how to disable elements in core.whitespace
X-Git-Tag: v1.6.0-rc1~40
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c921cc92e5ff2ead4dea112b19e555f521cf20b8;p=git.git

Documentation: clarify how to disable elements in core.whitespace

Noticed by Peter Valdemar Mørch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e7848055a..798b55151 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).