summaryrefslogtreecommitdiffstats
path: root/gitcore-tutorial.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-09-03 21:33:06 +0000
committerJunio C Hamano <junio@kernel.org>2010-09-03 21:33:06 +0000
commit2db3e750d172a78dadfb29235ad2a2c3c8d45a24 (patch)
tree1f66627398f37b23ec3af2697514d33d25060d96 /gitcore-tutorial.html
parentd7ae629d13f3242b66070b20f4bb83486948150a (diff)
downloadgit-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'gitcore-tutorial.html')
-rw-r--r--gitcore-tutorial.html22
1 files changed, 11 insertions, 11 deletions
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html
index 32142ceea..afa35f15e 100644
--- a/gitcore-tutorial.html
+++ b/gitcore-tutorial.html
@@ -428,7 +428,7 @@ valid, though.</p></div>
and a reference to an object is always the 40-byte hex
representation of that SHA1 name. The files in the <tt>refs</tt>
subdirectory are expected to contain these hex references
-(usually with a final <tt>'\n'</tt> at the end), and you should thus
+(usually with a final <tt>\n</tt> at the end), and you should thus
expect to see a number of 41-byte files containing these
references in these <tt>refs</tt> subdirectories when you actually start
populating your tree.</td>
@@ -623,7 +623,7 @@ creating the equivalent of a git "directory" object:</p></div>
<pre><tt>8988da15d077d4829fc51d8544c097def6644dbb</tt></pre>
</div></div>
<div class="para"><p>which is another incomprehensible object name. Again, if you want to,
-you can use <tt>git cat-file -t 8988d...</tt> to see that this time the object
+you can use <tt>git cat-file -t 8988d&#8230;</tt> to see that this time the object
is not a "blob" object, but a "tree" object (you can also use
<tt>git cat-file</tt> to actually output the raw object contents, but you'll see
mainly a binary mess, so that's less interesting).</p></div>
@@ -735,9 +735,9 @@ update the index cache:</p></div>
</div></div>
<div class="para"><p>(note how we didn't need the <tt>--add</tt> flag this time, since git knew
about the file already).</p></div>
-<div class="para"><p>Note what happens to the different <em>git diff-*</em> versions here. After
-we've updated <tt>hello</tt> in the index, <tt>git diff-files -p</tt> now shows no
-differences, but <tt>git diff-index -p HEAD</tt> still *does* show that the
+<div class="para"><p>Note what happens to the different <em>git diff-&#42;</em> versions here.
+After we've updated <tt>hello</tt> in the index, <tt>git diff-files -p</tt> now shows no
+differences, but <tt>git diff-index -p HEAD</tt> still <strong>does</strong> show that the
current state is different from the state we committed. In fact, now
<em>git diff-index</em> shows the same difference whether we use the <tt>--cached</tt>
flag or not, since now the index is coherent with the working tree.</p></div>
@@ -788,7 +788,7 @@ and it will show what the last commit (in <tt>HEAD</tt>) actually changed.</p></
</td>
<td class="content">
<div class="para"><p>Here is an ASCII art by Jon Loeliger that illustrates how
-various diff-* commands compare things.</p></div>
+various <em>diff-&#42;</em> commands compare things.</p></div>
<div class="literalblock">
<div class="content">
<pre><tt> diff-tree
@@ -1221,11 +1221,11 @@ environment, is <tt>git show-branch</tt>.</p></div>
<div class="para"><p>The first two lines indicate that it is showing the two branches
and the first line of the commit log message from their
top-of-the-tree commits, you are currently on <tt>master</tt> branch
-(notice the asterisk <tt>*</tt> character), and the first column for
+(notice the asterisk <tt>&#42;</tt> character), and the first column for
the later output lines is used to show commits contained in the
<tt>master</tt> branch, and the second column for the <tt>mybranch</tt>
branch. Three commits are shown along with their log messages.
-All of them have non blank characters in the first column (<tt>*</tt>
+All of them have non blank characters in the first column (<tt>&#42;</tt>
shows an ordinary commit on the current branch, <tt>-</tt> is a merge commit), which
means they are now part of the <tt>master</tt> branch. Only the "Some
work" commit has the plus <tt>+</tt> character in the second column,
@@ -1376,7 +1376,7 @@ HTTP(S)
first obtains the topmost commit object name from the remote site
by looking at the specified refname under <tt>repo.git/refs/</tt> directory,
and then tries to obtain the
-commit object by downloading from <tt>repo.git/objects/xx/xxx...</tt>
+commit object by downloading from <tt>repo.git/objects/xx/xxx&#8230;</tt>
using the object name of that commit object. Then it reads the
commit object to find out its parent commits and the associate
tree object; it repeats this process until it gets all the
@@ -1714,7 +1714,7 @@ directory.</p></div>
<td class="icon">
<div class="title">Note</div>
</td>
-<td class="content">You will see two files, <tt>pack-*.pack</tt> and <tt>pack-*.idx</tt>,
+<td class="content">You will see two files, <tt>pack-&#42;.pack</tt> and <tt>pack-&#42;.idx</tt>,
in <tt>.git/objects/pack</tt> directory. They are closely related to
each other, and if you ever copy them by hand to a different
repository for whatever reason, you should make sure you copy
@@ -2047,7 +2047,7 @@ to follow, not easier.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-07-21 21:55:43 UTC
+Last updated 2010-09-03 21:30:39 UTC
</div>
</div>
</body>