Merge branch 'mg/diff-uiconfig-doc' into maint

diff --git a/Documentation/git-verify-tag.txt b/Documentation/git-verify-tag.txt
index dada21242c915148543dda8485b3322894aeb4c5..8c9a71865b45120700c21a52d1e06aad45f3221f 100644 (file)
--- a/Documentation/git-verify-tag.txt
+++ b/Documentation/git-verify-tag.txt
@@ -15,17 +15,13 @@ Validates the gpg signature created by 'git tag'.
 
 OPTIONS
 -------
+-v::
+--verbose::
+       Print the contents of the tag object before validating it.
+
 <tag>...::
        SHA1 identifiers of git tag objects.
 
-Author
-------
-Written by Jan Harkes <jaharkes@cs.cmu.edu> and Eric W. Biederman <ebiederm@xmission.com>
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite