diff options
| author | Thomas Ackermann <th.acker@arcor.de> | 2013-04-15 19:49:04 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 11:08:37 -0700 |
| commit | d5fa1f1a69f578831179b77893aac480b986e875 (patch) | |
| tree | 1e04ba1f10d79969f18cb62d2a30844e98256b02 /Documentation/git-merge-index.txt | |
| parent | 3ab501209b46e83a377ac5a781a8f2fef7f4f30c (diff) | |
| download | git-d5fa1f1a69f578831179b77893aac480b986e875.tar.gz | |
The name of the hash function is "SHA-1", not "SHA1"
Use "SHA-1" instead of "SHA1" whenever we talk about the hash function.
When used as a programming symbol, we keep "SHA1".
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 0c80cec0e8..02676fb391 100644 --- 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. |