summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-12-01 13:58:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-12-01 13:58:46 -0800
commitc4d48ab5afc34b59582593622ef04da2543573d4 (patch)
tree46791a56efec952ce75577fbc87b352d1fa8dfe4 /Documentation
parentUpdate draft release notes for 1.5.4 (diff)
parentgit-tag: test that -s implies an annotated tag (diff)
downloadtgif-c4d48ab5afc34b59582593622ef04da2543573d4.tar.xz
Merge branch 'cr/tag-options'
* cr/tag-options: git-tag: test that -s implies an annotated tag "git-tag -s" should create a signed annotated tag builtin-tag: accept and process multiple -m just like git-commit Make builtin-tag.c use parse_options.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-tag.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 10d3e3fa95..784ec6d4c2 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -65,7 +65,9 @@ OPTIONS
Typing "git tag" without arguments, also lists all tags.
-m <msg>::
- Use the given tag message (instead of prompting)
+ Use the given tag message (instead of prompting).
+ If multiple `-m` options are given, there values are
+ concatenated as separate paragraphs.
-F <file>::
Take the tag message from the given file. Use '-' to