summaryrefslogtreecommitdiffstats
path: root/gittutorial.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-07-01 02:33:06 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-07-01 02:33:06 +0000
commit73d812ca2a8cff55e5ebb8a11b6f7d0496bba62c (patch)
treed44e468e3f0b00e132975f80c4aff9d30914d104 /gittutorial.html
parent688eae05f06ef3b7369c5631140c670296654de1 (diff)
downloadgit-htmldocs-73d812ca2a8cff55e5ebb8a11b6f7d0496bba62c.tar.gz
Autogenerated HTML docs for v1.6.3.3-363-g725cf
Diffstat (limited to 'gittutorial.html')
-rw-r--r--gittutorial.html26
1 files changed, 13 insertions, 13 deletions
diff --git a/gittutorial.html b/gittutorial.html
index fbe5efd96..80d0222c6 100644
--- a/gittutorial.html
+++ b/gittutorial.html
@@ -594,11 +594,11 @@ pulling, like this:</p></div>
alice$ git log -p HEAD..FETCH_HEAD</tt></pre>
</div></div>
<div class="para"><p>This operation is safe even if Alice has uncommitted local changes.
-The range notation HEAD..FETCH_HEAD" means "show everything that is reachable
-from the FETCH_HEAD but exclude anything that is reachable from HEAD.
+The range notation "HEAD..FETCH_HEAD" means "show everything that is reachable
+from the FETCH_HEAD but exclude anything that is reachable from HEAD".
Alice already knows everything that leads to her current state (HEAD),
-and reviewing what Bob has in his state (FETCH_HEAD) that she has not
-seen with this command</p></div>
+and reviews what Bob has in his state (FETCH_HEAD) that she has not
+seen with this command.</p></div>
<div class="para"><p>If Alice wants to visualize what Bob did since their histories forked
she can issue the following command:</p></div>
<div class="listingblock">
@@ -629,9 +629,9 @@ it easier:</p></div>
<div class="content">
<pre><tt>alice$ git remote add bob /home/bob/myrepo</tt></pre>
</div></div>
-<div class="para"><p>With this, Alice can perform the first part of the "pull" operation alone using the
-<em>git-fetch</em> command without merging them with her own branch,
-using:</p></div>
+<div class="para"><p>With this, Alice can perform the first part of the "pull" operation
+alone using the <em>git-fetch</em> command without merging them with her own
+branch, using:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>alice$ git fetch bob</tt></pre>
@@ -793,20 +793,20 @@ $ git log v2.5.. Makefile # commits since v2.5 which modify
</div></div>
<div class="para"><p>You can also give <em>git-log</em> a "range" of commits where the first is not
necessarily an ancestor of the second; for example, if the tips of
-the branches "stable-release" and "master" diverged from a common
+the branches "stable" and "master" diverged from a common
commit some time ago, then</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log stable..experimental</tt></pre>
+<pre><tt>$ git log stable..master</tt></pre>
</div></div>
-<div class="para"><p>will list commits made in the experimental branch but not in the
+<div class="para"><p>will list commits made in the master branch but not in the
stable branch, while</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log experimental..stable</tt></pre>
+<pre><tt>$ git log master..stable</tt></pre>
</div></div>
<div class="para"><p>will show the list of commits made on the stable branch but not
-the experimental branch.</p></div>
+the master branch.</p></div>
<div class="para"><p>The <em>git-log</em> command has a weakness: it must present commits in a
list. When the history has lines of development that diverged and
then merged back together, the order in which <em>git-log</em> presents
@@ -916,7 +916,7 @@ digressions that may be interesting at this point are:</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-06-07 16:04:47 UTC
+Last updated 2009-07-01 02:31:09 UTC
</div>
</div>
</body>