diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-03-21 12:58:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 11:19:52 -0700 |
| commit | 0488792d2e56bfe38be6ea7f5456bd3286c807b8 (patch) | |
| tree | e50b1bb2b3a4fd09fb3470a1b64c0f82b24c1ff8 /Documentation/git-tag.txt | |
| parent | a91aca44bf4b3746c3ce03583a1b3418d1610ef7 (diff) | |
| download | git-0488792d2e56bfe38be6ea7f5456bd3286c807b8.tar.gz | |
tag doc: move the description of --[no-]merged earlier
Move the documentation for the --merged & --no-merged options earlier
in the documentation, to sit along the other switches, and right next
to the similar --contains and --points-at switches.
It makes more sense to group the options together, not have some
options after the like of <tagname>, <object>, <format> etc.
This was originally put there when the --merged & --no-merged options
were introduced in 5242860f54 ("tag.c: implement '--merged' and
'--no-merged' options", 2015-09-10). It's not apparent from that
commit that the documentation is being placed apart from other
options, rather than along with them, so this was likely missed in the
initial review.
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 525737a5d8..33f18ea5fb 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -124,6 +124,11 @@ 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). + --points-at <object>:: Only list tags of the given object. @@ -173,11 +178,6 @@ This option is only applicable when listing tags without annotation lines. that of linkgit:git-for-each-ref[1]. When unspecified, defaults to `%(refname:strip=2)`. ---[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). - CONFIGURATION ------------- By default, 'git tag' in sign-with-default mode (-s) will use your |