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

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 544ba7ba218550ac1b09d9c95dc6f60ac604f7e8..2fb95bbd19f26317a542abfdb78d3b2be72f577b 100644 (file)
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -100,14 +100,6 @@ for each object specified on stdin that does not exist in the repository:
 <object> SP missing LF
 ------------
 
-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