Merge branch 'kw/merge-recursive-cleanup'

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index d97aad3439a9f5a64ca6c808b10906610ac47a94..543fb425ee7c1d4c09a5ad4afbd00b9b812e4871 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -188,8 +188,8 @@ This option is only applicable when listing tags without annotation lines.
        Defaults to HEAD.
 
 <format>::
-       A string that interpolates `%(fieldname)` from the object
-       pointed at by a ref being shown.  The format is the same as
+       A string that interpolates `%(fieldname)` from a tag ref being shown
+       and the object it points at.  The format is the same as
        that of linkgit:git-for-each-ref[1].  When unspecified,
        defaults to `%(refname:strip=2)`.