Merge branch 'maint'

diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index 81e3326772d94464708cc2037715e1e62eae5f11..5c6ebdfad93ea87f973194b2fe31e784033dc3c6 100644 (file)
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -8,6 +8,7 @@ git-mktree - Build a tree-object from ls-tree formatted text
 
 SYNOPSIS
 --------
+[verse]
 'git mktree' [-z] [--missing] [--batch]
 
 DESCRIPTION
@@ -34,14 +35,6 @@ OPTIONS
        optional.  Note - if the '-z' option is used, lines are terminated
        with NUL.
 
-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