Merge branch 'maint'

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 3b0c88271a80ad9dfc989dcb44247479f09431bf..ee4559b6f20d6cfe399c2b7e1b8dd9a1e2aafc7a 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -200,17 +200,6 @@ shows 10 reflog entries going back from the tip as of 1 hour ago.
 Without `--list`, the output also shows how these tips are
 topologically related with each other.
 
-
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
-
-Documentation
---------------
-Documentation by Junio C Hamano.
-
-
 GIT
 ---
 Part of the linkgit:git[1] suite