Merge branch 'jn/web' into maint

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5a90f65b5e9d9ce21bcd0c936a01ded5065d5868..5ec547cc0c10fb940b1bd2481940997cd375e830 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -49,6 +49,7 @@ include::pretty-options.txt[]
 -g, \--walk-reflogs::
        Show commits as they were recorded in the reflog. The log contains
        a record about how the tip of a reference was changed.
+       Cannot be combined with --reverse.
        See also gitlink:git-reflog[1].
 
 --decorate::
@@ -95,7 +96,7 @@ git log --since="2 weeks ago" \-- gitk::
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 
-git log -r --name-status release..test::
+git log --name-status release..test::
 
        Show the commits that are in the "test" branch but not yet
        in the "release" branch, along with the list of paths