tag doc: move the description of --[no-]merged earlier

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 8e70c5b6a4117034eb55969bd0a8d0702ae75d71..33f18ea5fb7b1f64a9469885c1f59841e92adc9d 100644 (file)
--- 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.
 
@@ -150,7 +155,11 @@ This option is only applicable when listing tags without annotation lines.
        'strip' removes both whitespace and commentary.
 
 --create-reflog::
-       Create a reflog for the tag.
+       Create a reflog for the tag. To globally enable reflogs for tags, see
+       `core.logAllRefUpdates` in linkgit:git-config[1].
+       The negated form `--no-create-reflog` only overrides an earlier
+       `--create-reflog`, but currently does not negate the setting of
+       `core.logallrefupdates`.
 
 <tagname>::
        The name of the tag to create, delete, or describe.
@@ -169,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