Merge branch 'dt/tests-with-env-not-subshell'

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index c418c44d40d1494d2f87d6ed45c229a56064f0b3..b424a1bc48bba96513da17ee63bee4383453c3b4 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -95,6 +95,12 @@ OPTIONS
        using fnmatch(3)).  Multiple patterns may be given; if any of
        them matches, the tag is shown.
 
+--sort=<type>::
+       Sort in a specific order. Supported type is "refname"
+       (lexicographic order), "version:refname" or "v:refname" (tag
+       names are treated as versions). Prepend "-" to reverse sort
+       order.
+
 --column[=<options>]::
 --no-column::
        Display tag listing in columns. See configuration variable
@@ -103,8 +109,9 @@ OPTIONS
 +
 This option is only applicable when listing tags without annotation lines.
 
---contains <commit>::
-       Only list tags which contain the specified commit.
+--contains [<commit>]::
+       Only list tags which contain the specified commit (HEAD if not
+       specified).
 
 --points-at <object>::
        Only list tags of the given object.