diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
| commit | 11f1df190fcc3ac9c3263a3eba8104cbdee4787d (patch) | |
| tree | d502d6143db9bbb16ca8afac629ff1b4126c9482 /technical | |
| parent | d71eb7dd5b4fb3cafaa3d603f625c0a0f75373f4 (diff) | |
| download | git-htmldocs-11f1df190fcc3ac9c3263a3eba8104cbdee4787d.tar.gz | |
Autogenerated HTML docs for v2.39.1-388-g2fc9e
Diffstat (limited to 'technical')
| -rw-r--r-- | technical/hash-function-transition.html | 4 | ||||
| -rw-r--r-- | technical/hash-function-transition.txt | 2 | ||||
| -rw-r--r-- | technical/rerere.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 1874731c0..44a9e0241 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -1616,7 +1616,7 @@ hash re-encode during clone and to encourage peers to modernize.</p></div> <div class="paragraph"><p>The design described here allows fetches by SHA-1 clients of a
personal SHA-256 repository because it’s not much more difficult than
allowing pushes from that repository. This support needs to be guarded
-by a configuration option --- servers like git.kernel.org that serve a
+by a configuration option — servers like git.kernel.org that serve a
large number of clients would not be expected to bear that cost.</p></div>
</div>
<div class="sect2">
@@ -2087,7 +2087,7 @@ See the history of this file in git.git for the history of subsequent <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>
diff --git a/technical/hash-function-transition.txt b/technical/hash-function-transition.txt index e2ac36dd2..ed5748108 100644 --- a/technical/hash-function-transition.txt +++ b/technical/hash-function-transition.txt @@ -562,7 +562,7 @@ 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 allowing pushes from that repository. This support needs to be guarded -by a configuration option --- servers like git.kernel.org that serve a +by a configuration option -- servers like git.kernel.org that serve a large number of clients would not be expected to bear that cost. Meaning of signatures diff --git a/technical/rerere.txt b/technical/rerere.txt index 35d454143..be58f1bee 100644 --- a/technical/rerere.txt +++ b/technical/rerere.txt @@ -99,7 +99,7 @@ conflict to leave line D means that the user declares: compatible with what AB and AC wanted to do. So the conflict we would see when merging AB into ACAB should be -resolved the same way---it is the resolution that is in line with that +resolved the same way--it is the resolution that is in line with that declaration. Imagine that similarly previously a branch XYXZ was forked from XY, |