Merge git-gui 0.14.0

diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt
index 8382fbe0ec5e59545e265317bdff38bfa098e0ed..c4d99f10281599ae52f95da455372e8ed759cfe7 100644 (file)
--- a/Documentation/git-show-index.txt
+++ b/Documentation/git-show-index.txt
@@ -20,15 +20,6 @@ The information it outputs is subset of what you can get from
 'git verify-pack -v'; this command only shows the packfile
 offset and SHA1 of each object.
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by Junio C Hamano
-
 GIT
 ---
 Part of the linkgit:git[1] suite