Merge git-gui 0.14.0

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 927ecee2f26cdf0bd30457d5016b654c01a23a14..8481f9db746b70c10a2f20a97a8ef4a68cb56d75 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -397,15 +397,6 @@ entries:
 
 X means any state and U means an unmerged index.
 
-
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite