Merge branch 'kb/am-deprecate-resolved'

diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt
index 9cbbed944c9ab7511e5e27876174968624ded5ad..fbdc8adae5b10a8ed88883647d2f0ccc3636cddc 100644 (file)
--- a/Documentation/git-show-index.txt
+++ b/Documentation/git-show-index.txt
@@ -19,7 +19,7 @@ Reads given idx file for packed Git archive created with
 
 The information it outputs is subset of what you can get from
 'git verify-pack -v'; this command only shows the packfile
-offset and SHA1 of each object.
+offset and SHA-1 of each object.
 
 GIT
 ---