summaryrefslogtreecommitdiffstats
path: root/git.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-21 19:27:13 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-21 19:27:13 -0700
commite3f080d1c1d091db97eb840de39a5245a3c82f3e (patch)
tree2d5821021b314217f92f1826b1c4100e809c8f82 /git.html
parent7692782cd994796eb7bd0bed592669c5090289bb (diff)
downloadgit-htmldocs-e3f080d1c1d091db97eb840de39a5245a3c82f3e.tar.gz
Autogenerated HTML docs for v1.8.2.1-538-gad776
Diffstat (limited to 'git.html')
-rw-r--r--git.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/git.html b/git.html
index 0946630d1..2fcc2be0e 100644
--- a/git.html
+++ b/git.html
@@ -2485,7 +2485,7 @@ are files GIT_EXTERNAL_DIFF can use to read the
</dt>
<dd>
<p>
-are the 40-hexdigit SHA1 hashes,
+are the 40-hexdigit SHA-1 hashes,
</p>
</dd>
<dt class="hdlist1">
@@ -2659,7 +2659,7 @@ and some number of parent commits.</p></div>
"version", represents a step in the project&#8217;s history, and each parent
represents an immediately preceding step. Commits with more than one
parent represent merges of independent lines of development.</p></div>
-<div class="paragraph"><p>All objects are named by the SHA1 hash of their contents, normally
+<div class="paragraph"><p>All objects are named by the SHA-1 hash of their contents, normally
written as a string of 40 hex digits. Such names are globally unique.
The entire history leading up to a commit can be vouched for by signing
just that commit. A fourth object type, the tag, is provided for this
@@ -2667,9 +2667,9 @@ purpose.</p></div>
<div class="paragraph"><p>When first created, objects are stored in individual files, but for
efficiency may later be compressed together into "pack files".</p></div>
<div class="paragraph"><p>Named pointers called refs mark interesting points in history. A ref
-may contain the SHA1 name of an object or the name of another ref. Refs
-with names beginning <code>ref/head/</code> contain the SHA1 name of the most
-recent commit (or "head") of a branch under development. SHA1 names of
+may contain the SHA-1 name of an object or the name of another ref. Refs
+with names beginning <code>ref/head/</code> contain the SHA-1 name of the most
+recent commit (or "head") of a branch under development. SHA-1 names of
tags of interest are stored under <code>ref/tags/</code>. A special ref named
<code>HEAD</code> contains the name of the currently checked-out branch.</p></div>
<div class="paragraph"><p>The index file is initialized with a list of all paths and, for each
@@ -2743,7 +2743,7 @@ subscribed to the list to send a message there.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-26 15:45:07 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>