Merge branch 'tb/ci-run-cocci-with-18.04' into maint

[thirdparty/git.git] / Documentation / git-tag.txt

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index f6d9791780288ff077f5c4bbd0fa4c4c47cd9cea..56656d1be60331cf9896b02e0ccf553c83d88b01 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -15,7 +15,7 @@ SYNOPSIS
 'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
        [--points-at <object>] [--column[=<options>] | --no-column]
        [--create-reflog] [--sort=<key>] [--format=<format>]
-       [--[no-]merged [<commit>]] [<pattern>...]
+       [--merged <commit>] [--no-merged <commit>] [<pattern>...]
 'git tag' -v [--format=<format>] <tagname>...
 
 DESCRIPTION
@@ -149,11 +149,11 @@ This option is only applicable when listing tags without annotation lines.
 
 --merged [<commit>]::
        Only list tags whose commits are reachable from the specified
-       commit (`HEAD` if not specified), incompatible with `--no-merged`.
+       commit (`HEAD` if not specified).
 
 --no-merged [<commit>]::
        Only list tags whose commits are not reachable from the specified
-       commit (`HEAD` if not specified), incompatible with `--merged`.
+       commit (`HEAD` if not specified).
 
 --points-at <object>::
        Only list tags of the given object (HEAD if not
@@ -377,6 +377,11 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1
 
 include::date-formats.txt[]
 
+NOTES
+-----
+
+include::ref-reachability-filters.txt[]
+
 SEE ALSO
 --------
 linkgit:git-check-ref-format[1].