summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2017-03-21 12:58:47 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 11:19:52 -0700
commitb084060921d6403164e8dee506de787d017569c3 (patch)
tree44c060a0bc714da05598668f7ed0ad029c507e51
parenttag doc: move the description of --[no-]merged earlier (diff)
downloadtgif-b084060921d6403164e8dee506de787d017569c3.tar.xz
tag doc: split up the --[no-]merged documentation
Split up the --[no-]merged documentation into documentation that documents each option independently. This is in line with how "branch" and "for-each-ref" are documented, and makes subsequent changes to discuss the limits & caveats of each option easier to read. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-tag.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 33f18ea5fb..68b0ab2410 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -124,10 +124,13 @@ This option is only applicable when listing tags without annotation lines.
Only list tags which contain the specified commit (HEAD if not
specified).
---[no-]merged [<commit>]::
- Only list tags whose tips are reachable, or not reachable
- if `--no-merged` is used, from the specified commit (`HEAD`
- if not specified).
+--merged [<commit>]::
+ Only list tags whose tips are reachable from the specified commit
+ (`HEAD` if not specified).
+
+--no-merged [<commit>]::
+ Only list tags whose tips are not reachable from the specified
+ commit (`HEAD` if not specified).
--points-at <object>::
Only list tags of the given object.