diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-03-21 12:58:48 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-21 11:19:52 -0700 |
| commit | 8881d35cace41604dba72c1b6b5ab5a59e0c2b94 (patch) | |
| tree | 4048e822e3f486422807e278bef7e839f2127827 /Documentation/git-tag.txt | |
| parent | tag doc: split up the --[no-]merged documentation (diff) | |
| download | tgif-8881d35cace41604dba72c1b6b5ab5a59e0c2b94.tar.xz | |
tag doc: reword --[no-]merged to talk about commits, not tips
Change the wording for the --merged and --no-merged options to talk
about "commits" instead of "tips".
This phrasing was copied from the "branch" documentation in commit
5242860f54 ("tag.c: implement '--merged' and '--no-merged' options",
2015-09-10). Talking about the "tip" is branch nomenclature, not
something usually associated with tags.
This phrasing might lead the reader to believe that these options
might find tags pointing to trees or blobs, let's instead be explicit
and only talk about commits.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-tag.txt')
| -rw-r--r-- | Documentation/git-tag.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 68b0ab2410..3abf912782 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -125,11 +125,11 @@ This option is only applicable when listing tags without annotation lines. specified). --merged [<commit>]:: - Only list tags whose tips are reachable from the specified commit - (`HEAD` if not specified). + Only list tags whose commits are reachable from the specified + commit (`HEAD` if not specified). --no-merged [<commit>]:: - Only list tags whose tips are not reachable from the specified + Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified). --points-at <object>:: |