Merge branch 'maint'

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 578bdb7850a1d661ccb85f9da71071106e6b3bff..d3f258869f5d441bea16b46d8030eb64ecb7df99 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -75,7 +75,7 @@ OPTIONS
 
 --merge-base::
        Instead of showing the commit list, just act like the
-       `git-merge-base -a` command, except that it can accept
+       'git-merge-base -a' command, except that it can accept
        more than two heads.
 
 --independent::
@@ -182,7 +182,7 @@ topologically related with each other.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 
 Documentation