summaryrefslogtreecommitdiff
path: root/Documentation/technical/hash-function-transition.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2019-11-05 17:07:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-07 04:42:00 (GMT)
commit031fd4b93b8182761948aa348565118955f48307 (patch)
tree2d4632eff752e87e9e417903584152f50d2d58ae /Documentation/technical/hash-function-transition.txt
parent566a1439f6f56c2171b8853ddbca0ad3f5098770 (diff)
downloadgit-031fd4b93b8182761948aa348565118955f48307.zip
git-031fd4b93b8182761948aa348565118955f48307.tar.gz
git-031fd4b93b8182761948aa348565118955f48307.tar.bz2
Documentation: fix a bunch of typos, both old and new
Reported-by: Jens Schleusener <Jens.Schleusener@fossies.org> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/hash-function-transition.txt')
-rw-r--r--Documentation/technical/hash-function-transition.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt
index 2ae8fa4..8a4596b 100644
--- a/Documentation/technical/hash-function-transition.txt
+++ b/Documentation/technical/hash-function-transition.txt
@@ -531,7 +531,7 @@ Until Git protocol gains SHA-256 support, using SHA-256 based storage
on public-facing Git servers is strongly discouraged. Once Git
protocol gains SHA-256 support, SHA-256 based servers are likely not
to support SHA-1 compatibility, to avoid what may be a very expensive
-hash reencode during clone and to encourage peers to modernize.
+hash re-encode during clone and to encourage peers to modernize.
The design described here allows fetches by SHA-1 clients of a
personal SHA-256 repository because it's not much more difficult than
@@ -602,7 +602,7 @@ git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256}
Choice of Hash
--------------
-In early 2005, around the time that Git was written, Xiaoyun Wang,
+In early 2005, around the time that Git was written, Xiaoyun Wang,
Yiqun Lisa Yin, and Hongbo Yu announced an attack finding SHA-1
collisions in 2^69 operations. In August they published details.
Luckily, no practical demonstrations of a collision in full SHA-1 were