summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-06 22:53:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-06 22:53:59 (GMT)
commit05d290e1dbd2ed424cd3c872c5b20390100fa5f7 (patch)
tree4c5dddfbfd8cebb208550cf423ace1576150b8ac /Documentation
parent7e31236f652ad9db221511eaf157ce0ef55585d6 (diff)
parent9eed6e40c0ec9cbe89efd7303c3facd16fa1364f (diff)
downloadgit-05d290e1dbd2ed424cd3c872c5b20390100fa5f7.zip
git-05d290e1dbd2ed424cd3c872c5b20390100fa5f7.tar.gz
git-05d290e1dbd2ed424cd3c872c5b20390100fa5f7.tar.bz2
Merge branch 'nm/tag-edit'
"git tag" learned an explicit "--edit" option that allows the message given via "-m" and "-F" to be further edited. * nm/tag-edit: tag: add --edit option
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-tag.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 956fc01..1d17101 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -9,7 +9,7 @@ git-tag - Create, list, delete or verify a tag object signed with GPG
SYNOPSIS
--------
[verse]
-'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
+'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] [-e]
<tagname> [<commit> | <object>]
'git tag' -d <tagname>...
'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
@@ -167,6 +167,12 @@ This option is only applicable when listing tags without annotation lines.
Implies `-a` if none of `-a`, `-s`, or `-u <keyid>`
is given.
+-e::
+--edit::
+ The message taken from file with `-F` and command line with
+ `-m` are usually used as the tag message unmodified.
+ This option lets you further edit the message taken from these sources.
+
--cleanup=<mode>::
This option sets how the tag message is cleaned up.
The '<mode>' can be one of 'verbatim', 'whitespace' and 'strip'. The