Update draft release notes for 1.6.0.1

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 61c376057c0f2b9510bf6f1b2beb42f9859b7f46..676c39bb8436f35e1471b8dd50fd888ae1ac5c6b 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -693,7 +693,7 @@ gitcvs.usecrlfattr
        files to determine the '-k' modes to use. If `crlf` is set,
        the '-k' mode will be left blank, so cvs clients will
        treat it as text. If `crlf` is explicitly unset, the file
-       will be set with '-kb' mode, which supresses any newline munging
+       will be set with '-kb' mode, which suppresses any newline munging
        the client might otherwise do. If `crlf` is not specified,
        then 'gitcvs.allbinary' is used. See linkgit:gitattributes[5].
 
@@ -978,6 +978,11 @@ pack.packSizeLimit::
        can be overridden by the `\--max-pack-size` option of
        linkgit:git-repack[1].
 
+pager.<cmd>::
+       Allows to set your own pager preferences for each command, overriding
+       the default. If `\--pager` or `\--no-pager` is specified on the command
+       line, it takes precedence over this option.
+
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.