Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index a82d2e27bdd9c923603404d8bb9445e5de3f8edc..e953ba4439f5995c797b4d7ad869847a5479d982 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -95,6 +95,14 @@ 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. When this option is not given, the sort order defaults to the
+       value configured for the 'tag.sort' variable if it exists, or
+       lexicographic order otherwise. See linkgit:git-config[1].
+
 --column[=<options>]::
 --no-column::
        Display tag listing in columns. See configuration variable
@@ -103,8 +111,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.
@@ -310,6 +319,7 @@ include::date-formats.txt[]
 SEE ALSO
 --------
 linkgit:git-check-ref-format[1].
+linkgit:git-config[1].
 
 GIT
 ---