Merge branch 'maint'

diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index 6403126a029bf43acaa219296353f7ab1f2040a0..d7d4b92894d143daaf1f0e27fa4bdbcf35aba10d 100644 (file)
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -28,14 +28,6 @@ read and execute permissions to the directory in order to execute the
 programs in it. The programs are executed with a cwd of $HOME, and
 <argument> is parsed as a command-line string.
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite