Merge branch 'kb/am-deprecate-resolved'

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index b21aa87fe87a26f738c971f8c3dffdcf44fb13cd..22894cbee6794fd738cf45aefefff0679dcb940d 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -33,7 +33,7 @@ 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 a tag reference for the SHA1 object name of the commit object is
+Otherwise just a tag reference for the SHA-1 object name of the commit object is
 created (i.e. a lightweight tag).
 
 A GnuPG signed tag object will be created when `-s` or `-u