@matheusbsbs / matheus-bagliano / commits / 0488792d2e

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>

Ævar Arnfjörð Bjarmason committed Mar 21, 2017 at 12:58 UTC 0488792d2e56bfe38be6ea7f5456bd3286c807b8

1 file changed +5 -5

Documentation/git-tag.txt

+5 -5

@@ -124,6 +124,11 @@ This option is only applicable when listing tags without annotation lines.

124 Only list tags which contain the specified commit (HEAD if not

125 specified).

126

127 +--[no-]merged [<commit>]::

128 + Only list tags whose tips are reachable, or not reachable

129 + if `--no-merged` is used, from the specified commit (`HEAD`

130 + if not specified).

131 +

132 --points-at <object>::

133 Only list tags of the given object.

134

@@ -173,11 +178,6 @@ This option is only applicable when listing tags without annotation lines.

178 that of linkgit:git-for-each-ref[1]. When unspecified,

179 defaults to `%(refname:strip=2)`.

180

176 ---[no-]merged [<commit>]::

177 - Only list tags whose tips are reachable, or not reachable

178 - if `--no-merged` is used, from the specified commit (`HEAD`

179 - if not specified).

180 -

181 CONFIGURATION

182 -------------

183 By default, 'git tag' in sign-with-default mode (-s) will use your