merge-recursive: conflicting rename case.

[git.git] / Documentation / git-tag.txt

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 95de436..e8892bb 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -23,7 +23,7 @@ creates a 'tag' object, and requires the tag message.  Unless
 in the tag message.
 
 Otherwise just the SHA1 object name of the commit object is
 in the tag message.
 
 Otherwise just the SHA1 object name of the commit object is

-written (i.e. an lightweight tag).
+written (i.e. a lightweight tag).

 
 A GnuPG signed tag object will be created when `-s` or `-u
 <key-id>` is used.  When `-u <key-id>` is not used, the
 
 A GnuPG signed tag object will be created when `-s` or `-u
 <key-id>` is used.  When `-u <key-id>` is not used, the


@@ -32,6 +32,26 @@ GnuPG key for signing.
 
 `-d <tag>` deletes the tag.
 
 
 `-d <tag>` deletes the tag.
 

+OPTIONS
+-------
+-a::
+       Make an unsigned, annotated tag object
+
+-s::
+       Make a GPG-signed tag, using the default e-mail address's key
+
+-u <key-id>::
+       Make a GPG-signed tag, using the given key
+
+-f::
+       Replace an existing tag with the given name (instead of failing)
+
+-d::
+       Delete an existing tag with the given name
+
+-m <msg>::
+       Use the given tag message (instead of prompting)
+

 
 Author
 ------
 
 Author
 ------