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

diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index 6bc1c21e6283284e2eae16d7ec4cb8183d8e0851..a73933a931161ba81d6bf8dfaa9f2fe4287e0331 100644 (file)
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -25,15 +25,6 @@ OPTIONS
        and number of objects that can be removed by running
        `git prune-packed`.
 
-
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite