Update draft release notes to Git 2.0

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 22894cbee6794fd738cf45aefefff0679dcb940d..404257df9fcad2ac5428b0608341e0c6d1337384 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -42,6 +42,17 @@ committer identity for the current user is used to find the
 GnuPG key for signing.         The configuration variable `gpg.program`
 is used to specify custom GnuPG binary.
 
+Tag objects (created with `-a`, `s`, or `-u`) are called "annotated"
+tags; they contain a creation date, the tagger name and e-mail, a
+tagging message, and an optional GnuPG signature. Whereas a
+"lightweight" tag is simply a name for an object (usually a commit
+object).
+
+Annotated tags are meant for release while lightweight tags are meant
+for private or temporary object labels. For this reason, some git
+commands for naming objects (like `git describe`) will ignore
+lightweight tags by default.
+
 
 OPTIONS
 -------
@@ -92,8 +103,9 @@ OPTIONS
 +
 This option is only applicable when listing tags without annotation lines.
 
---contains <commit>::
-       Only list tags which contain the specified commit.
+--contains [<commit>]::
+       Only list tags which contain the specified commit (HEAD if not
+       specified).
 
 --points-at <object>::
        Only list tags of the given object.