Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config

diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index fed115acd01a63801a647ae870357d4c2d59ea44..79448c505bd66f370ab0d79fd9f6a31af84752be 100644 (file)
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -63,14 +63,6 @@ SEE ALSO
 --------
 linkgit:git-patch-id[1]
 
-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