Merge branch 'jn/gitweb-js-blame' into next

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 1ca56c85aa66b96dc1774b77ba1e117d93847033..d3931294d174e5c06adb81e428e31e00fbfa3b5e 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -365,15 +365,6 @@ SEE ALSO
 linkgit:git-config[1],
 linkgit:git-add[1]
 
-
-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