Merge branch 'bf/commit-template-no-cleanup'

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 51edeecbe5b546c6fbbbe117f39b51f352cb6bc8..4b0a502e8ef92ac989cce308f87e1f269a8a69be 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -53,14 +53,6 @@ OPTIONS
        conversion. If the file is read from standard input then this
        is always implied, unless the --path option is given.
 
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite