Merge branch 'nd/grep-assume-unchanged'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ea0cd97b04296d29bca853f1e20383ba9f840851..6b3ac5aa90757cde33f6a5d442c570aee06d2f0b 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -725,6 +725,10 @@ gc.rerereunresolved::
        kept for this many days when 'git-rerere gc' is run.
        The default is 15 days.  See linkgit:git-rerere[1].
 
+gitcvs.commitmsgannotation::
+       Append this string to each commit message. Set to empty string
+       to disable this feature. Defaults to "via git-CVS emulator".
+
 gitcvs.enabled::
        Whether the CVS server interface is enabled for this repository.
        See linkgit:git-cvsserver[1].