Merge branch 'maint'

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 838794dca71d59f82eaec770ba31537297af8066..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).
@@ -685,7 +686,7 @@ gitcvs.usecrlfattr
        treat it as text. If `crlf` is explicitly unset, the file
        will be set with '-kb' mode, which supresses any newline munging
        the client might otherwise do. If `crlf` is not specified,
-       then 'gitcvs.allbinary' is used. See linkgit:gitattribute[5].
+       then 'gitcvs.allbinary' is used. See linkgit:gitattributes[5].
 
 gitcvs.allbinary::
        This is used if 'gitcvs.usecrlfattr' does not resolve