Merge branch 'sb/line-log-plug-pairdiff-leak'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1f7bc67d6cc8a842151fc2e4705ecc4e6fb8392e..18bc716a0c89e42d91973b510da1d61d33aad977 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -184,7 +184,7 @@ log.date::
        `--date` option.)  Defaults to "default", which means to write
        dates like `Sat May 8 19:35:34 2010 -0500`.
 
-log.showroot::
+log.showRoot::
        If `false`, `git log` and related commands will not treat the
        initial commit as a big creation event.  Any root commits in
        `git log -p` output would be shown without a diff attached.