Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: clarify how to disable elements in core.whitespace
author
Junio C Hamano
<gitster@pobox.com>
Fri, 25 Jul 2008 07:34:47 +0000
(
00:34
-0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 25 Jul 2008 20:56:21 +0000
(13:56 -0700)
Noticed by Peter Valdemar Mørch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
a2d07d8
)
diff --git
a/Documentation/config.txt
b/Documentation/config.txt
index e7848055a90c38f48ad7180cb538d0b00e482710..798b551514a81549d1d9b31b5a8e079e521ba657 100644
(file)
--- 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).