Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 0c80cec0e8d6bd2bf5798e9c34316b57b7afc776..02676fb39197d8c4ae33b3d6aa3e8fa27b8e3350 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 This looks up the <file>(s) in the index and, if there are any merge
-entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
+entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty
 argument if no file), and <file> as argument 4.  File modes for the three
 files are passed as arguments 5, 6 and 7.