summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-06 18:39:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-06 18:39:13 (GMT)
commita2595f05c7d8c9369623cbc19f92f3f1be6fb534 (patch)
tree9112ba6b6e9423a8a84d274f3d90841ce444c643 /Documentation
parent01e1d54418a016fb305cb29295f54a86c57dc316 (diff)
parent61c2fe0c2984a7785e2ac803ce33e23663295b24 (diff)
downloadgit-a2595f05c7d8c9369623cbc19f92f3f1be6fb534.zip
git-a2595f05c7d8c9369623cbc19f92f3f1be6fb534.tar.gz
git-a2595f05c7d8c9369623cbc19f92f3f1be6fb534.tar.bz2
Merge branch 'la/tag-force-signing-annotated-tags'
"git tag" can create an annotated tag without explicitly given an "-a" (or "-s") option (i.e. when a tag message is given). A new configuration variable, tag.forceSignAnnotated, can be used to tell the command to create signed tag in such a situation. * la/tag-force-signing-annotated-tags: tag: add the option to force signing of annotated tags
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d296656..42d2b50 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2744,6 +2744,11 @@ submodule.fetchJobs::
in parallel. A value of 0 will give some reasonable default.
If unset, it defaults to 1.
+tag.forceSignAnnotated::
+ A boolean to specify whether annotated tags created should be GPG signed.
+ If `--annotate` is specified on the command line, it takes
+ precedence over this option.
+
tag.sort::
This variable controls the sort ordering of tags when displayed by
linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the