Merge branch 'jc/maint-branch-mergeoptions' into maint

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 634423a69ee6a4f2e9c7dd3941fd5160fbf6c99f..26fdadc642a3534c4005488cb9ca2b2a47a495a1 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -421,15 +421,6 @@ SEE ALSO
 linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
 linkgit:gitignore[5]
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite