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

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 9cd8ccef37f131d7913926ef9b5b7b49fe6d3463..8d481948bd9b29393c8884abfef9d0a76c922c2d 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -46,15 +46,6 @@ omit diff output for unmerged entries and just show "Unmerged".
 
 include::diff-format.txt[]
 
-
-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