Merge branch 'jn/rebase-rename-am' into maint

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index f1499bba88028775032819708db22a3250b5b840..81ba29669c52a7c50fb126b7b70c3a867df25f00 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -32,7 +32,7 @@ no <rev> nor <glob> is given on the command line.
 OPTIONS
 -------
 <rev>::
-       Arbitrary extended SHA1 expression (see linkgit:git-rev-parse[1])
+       Arbitrary extended SHA1 expression (see linkgit:gitrevisions[1])
        that typically names a branch head or a tag.
 
 <glob>::