From d5fa1f1a69f578831179b77893aac480b986e875 Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Mon, 15 Apr 2013 19:49:04 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-ls-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-ls-files.txt') 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 -- cgit v1.2.1