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-ls-files.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-ls-files.txt')
| -rw-r--r-- | Documentation/git-ls-files.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 0bdebff6f7..c0856a6e0a 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -164,7 +164,7 @@ which case it outputs: 'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine detailed information on unmerged paths. -For an unmerged path, instead of recording a single mode/SHA1 pair, +For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the |