Merge branch 'jc/maint-branch-mergeoptions' into maint

diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt
index 035cc3018f22a9e2669c94f10475624d02f4098a..775024da3ed6ed50e8aa587dc31eb79f00030e84 100644 (file)
--- a/Documentation/git-update-server-info.txt
+++ b/Documentation/git-update-server-info.txt
@@ -38,15 +38,6 @@ what they are for:
 
 * info/refs
 
-
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
-Documentation
---------------
-Documentation by Junio C Hamano.
-
 GIT
 ---
 Part of the linkgit:git[1] suite