Merge branch 'jk/merge-one-file-working-tree' into maint

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 1aad8bfc597c029d6804f1bac1d35d85622cd986..14609cbd4dc2f7f3c16f7b660e4aff76eca6065b 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -233,18 +233,6 @@ SEE ALSO
 --------
 linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-and Junio C Hamano <gitster@pobox.com>
-
-Documentation
---------------
-Documentation by Jon Loeliger,
-David Greaves,
-Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite