Merge branch 'jk/combine-diff-binary-etc'

diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index 71912a19a4dcda5f2b76d1c06b4c9ef5051265e3..9b2049d674a5d0b71a9454b2ce4afbfa59e2db34 100644 (file)
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -46,16 +46,6 @@ OPTIONS
 --keep-cr::
        Do not remove `\r` from lines ending with `\r\n`.
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-and Junio C Hamano <gitster@pobox.com>
-
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite