Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1e6dbd93b1939bb3ce01f5873a433f981aa1f236..5ec547cc0c10fb940b1bd2481940997cd375e830 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -96,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