summaryrefslogtreecommitdiffstats
path: root/gittutorial-2.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 /gittutorial-2.html
parent7692782cd994796eb7bd0bed592669c5090289bb (diff)
downloadgit-htmldocs-e3f080d1c1d091db97eb840de39a5245a3c82f3e.tar.gz
Autogenerated HTML docs for v1.8.2.1-538-gad776
Diffstat (limited to 'gittutorial-2.html')
-rw-r--r--gittutorial-2.html18
1 files changed, 9 insertions, 9 deletions
diff --git a/gittutorial-2.html b/gittutorial-2.html
index 0aaf3327e..50fa86dbf 100644
--- a/gittutorial-2.html
+++ b/gittutorial-2.html
@@ -785,16 +785,16 @@ $ git commit -a -m "add emphasis"
<div class="paragraph"><p>What are the 7 digits of hex that Git responded to the commit with?</p></div>
<div class="paragraph"><p>We saw in part one of the tutorial that commits have names like this.
It turns out that every object in the Git history is stored under
-a 40-digit hex name. That name is the SHA1 hash of the object&#8217;s
+a 40-digit hex name. That name is the SHA-1 hash of the object&#8217;s
contents; among other things, this ensures that Git will never store
-the same data twice (since identical data is given an identical SHA1
+the same data twice (since identical data is given an identical SHA-1
name), and that the contents of a Git object will never change (since
that would change the object&#8217;s name as well). The 7 char hex strings
here are simply the abbreviation of such 40 character long strings.
Abbreviations can be used everywhere where the 40 character strings
can be used, so long as they are unambiguous.</p></div>
<div class="paragraph"><p>It is expected that the content of the commit object you created while
-following the example above generates a different SHA1 hash than
+following the example above generates a different SHA-1 hash than
the one shown above because the commit object records the time when
it was created and the name of the person performing the commit.</p></div>
<div class="paragraph"><p>We can ask Git about this particular object with the <code>cat-file</code>
@@ -816,13 +816,13 @@ initial commit</code></pre>
a file. In addition, a tree can also refer to other tree objects,
thus creating a directory hierarchy. You can examine the contents of
any tree using ls-tree (remember that a long enough initial portion
-of the SHA1 will also work):</p></div>
+of the SHA-1 will also work):</p></div>
<div class="listingblock">
<div class="content">
<pre><code>$ git ls-tree 92b8b694
100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad file.txt</code></pre>
</div></div>
-<div class="paragraph"><p>Thus we see that this tree has one file in it. The SHA1 hash is a
+<div class="paragraph"><p>Thus we see that this tree has one file in it. The SHA-1 hash is a
reference to that file&#8217;s data:</p></div>
<div class="listingblock">
<div class="content">
@@ -838,7 +838,7 @@ hello world</code></pre>
<div class="paragraph"><p>Note that this is the old file data; so the object that Git named in
its response to the initial tree was a tree with a snapshot of the
directory state that was recorded by the first commit.</p></div>
-<div class="paragraph"><p>All of these objects are stored under their SHA1 names inside the Git
+<div class="paragraph"><p>All of these objects are stored under their SHA-1 names inside the Git
directory:</p></div>
<div class="listingblock">
<div class="content">
@@ -871,7 +871,7 @@ ref: refs/heads/master</code></pre>
</div></div>
<div class="paragraph"><p>As you can see, this tells us which branch we&#8217;re currently on, and it
tells us this by naming a file under the .git directory, which itself
-contains a SHA1 name referring to a commit object, which we can
+contains a SHA-1 name referring to a commit object, which we can
examine with cat-file:</p></div>
<div class="listingblock">
<div class="content">
@@ -951,7 +951,7 @@ The name of the current branch is stored in .git/HEAD.
</ul></div>
<div class="paragraph"><p>Note, by the way, that lots of commands take a tree as an argument.
But as we can see above, a tree can be referred to in many different
-ways&#8212;by the SHA1 name for that tree, by the name of a commit that
+ways&#8212;by the SHA-1 name for that tree, by the name of a commit that
refers to the tree, by the name of a branch whose head refers to that
tree, etc.--and most such commands can accept any of these names.</p></div>
<div class="paragraph"><p>In command synopses, the word "tree-ish" is sometimes used to
@@ -1167,7 +1167,7 @@ example, creating a new commit.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>