aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-tag.txt
diff options
context:
space:
mode:
authorDirk Süsserott <newsletter@dirk.my1.cc>2008-03-24 15:43:08 -0400
committerJunio C Hamano <gitster@pobox.com>2008-03-24 22:14:35 -0700
commit995e8df4a9de9cf7c1b98dac922d96dc6606946d (patch)
tree87b6d022e410d3402dd86effd9696f5b3af8ac28 /Documentation/git-tag.txt
parentec31b0ce983e7e96b8a419dec3c34907b2f8226e (diff)
downloadgit-995e8df4a9de9cf7c1b98dac922d96dc6606946d.tar.gz
Documentation: git-tag '-m'/'-F' implies '-a'
Diffstat (limited to 'Documentation/git-tag.txt')
-rw-r--r--Documentation/git-tag.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index b62a3d1c58..c22fb71176 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -26,6 +26,9 @@ creates a 'tag' object, and requires the tag message. Unless
`-m <msg>` or `-F <file>` is given, an editor is started for the user to type
in the tag message.
+If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <key-id>`
+are absent, `-a` is implied.
+
Otherwise just the SHA1 object name of the commit object is
written (i.e. a lightweight tag).
@@ -68,10 +71,14 @@ OPTIONS
Use the given tag message (instead of prompting).
If multiple `-m` options are given, there values are
concatenated as separate paragraphs.
+ Implies `-a` if none of `-a`, `-s`, or `-u <key-id>`
+ is given.
-F <file>::
Take the tag message from the given file. Use '-' to
read the message from the standard input.
+ Implies `-a` if none of `-a`, `-s`, or `-u <key-id>`
+ is given.
CONFIGURATION
-------------