Merge branch 'jc/hash-object' into maint

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1f7bc67d6cc8a842151fc2e4705ecc4e6fb8392e..5692945a0b38c0b9e8e79e73a9a755c292224c98 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -62,9 +62,9 @@ produced by `--stat`, etc.
        output by allowing them to allocate space in advance.
 
 -L <start>,<end>:<file>::
--L :<regex>:<file>::
+-L :<funcname>:<file>::
        Trace the evolution of the line range given by "<start>,<end>"
-       (or the funcname regex <regex>) within the <file>.  You may
+       (or the function name regex <funcname>) within the <file>.  You may
        not give any pathspec limiters.  This is currently limited to
        a walk starting from a single revision, i.e., you may only
        give zero or one positive revision arguments.
@@ -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.