Merge branch 'maint'

diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt
index 995db9feadf68df6f22de745d90790a145128e44..c49d727f7463446c4182807cbd9077db5e34007f 100644 (file)
--- a/Documentation/git-unpack-file.txt
+++ b/Documentation/git-unpack-file.txt
@@ -22,14 +22,6 @@ OPTIONS
 <blob>::
        Must be a blob id
 
-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