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

diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index ddf7a18dc42ef4d5f8ad44aed89ee5b17bb0e9a6..82ae34b9b80d8f3fd8605d5c06cc37c7a203f758 100644 (file)
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -91,15 +91,6 @@ With '--force', the fast-forward check is disabled for all refs.
 Optionally, a <ref> parameter can be prefixed with a plus '+' sign
 to disable the fast-forward check only on that ref.
 
-
-Author
-------
-Written by Nick Hengeveld <nickh@reactrix.com>
-
-Documentation
---------------
-Documentation by Nick Hengeveld
-
 GIT
 ---
 Part of the linkgit:git[1] suite