Merge branch 'ss/cherry-pick-x-doc' into maint

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index f0a8a1aff3694cf00587d8670a8fe9962fe98af3..7f075e84f54e3abc5c16b7cae57af831bd2b5bd7 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -72,17 +72,6 @@ Discussion
 
 include::i18n.txt[]
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <gitster@pobox.com>.  Significantly enhanced by
-Johannes Schindelin <Johannes.Schindelin@gmx.de>.
-
-
-Documentation
--------------
-Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite