Merge branch 'ap/log-mailmap'

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 9c1d2f1781c15da786d0b1e9fb2d39562e474f29..45a225e0aa0ea662393eb65fcb32b702bdd608e6 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -131,11 +131,13 @@ This option is only applicable in non-verbose mode.
        use `git branch --list <pattern>` to list matching branches.
 
 -v::
+-vv::
 --verbose::
        When in list mode,
        show sha1 and commit subject line for each head, along with
        relationship to upstream branch (if any). If given twice, print
-       the name of the upstream branch, as well.
+       the name of the upstream branch, as well (see also `git remote
+       show <remote>`).
 
 -q::
 --quiet::