diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-08-29 08:56:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-08-29 08:56:58 +0000 |
| commit | a387df351c783f68378511c35d12d637498c7211 (patch) | |
| tree | b093060bb646423d79ae257cf9b26a75f2c26821 /gittutorial.html | |
| parent | f9e04eb9a776f91e487bc56bd35c2d6cff4a4cc3 (diff) | |
| download | git-htmldocs-a387df351c783f68378511c35d12d637498c7211.tar.gz | |
Autogenerated HTML docs for v1.6.0.1-141-g445ca
Diffstat (limited to 'gittutorial.html')
| -rw-r--r-- | gittutorial.html | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/gittutorial.html b/gittutorial.html index 8651c5bc6..6e616900d 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -586,9 +586,31 @@ pulling, like this:</p></div> <div class="listingblock">
<div class="content">
<pre><tt>alice$ git fetch /home/bob/myrepo master
-alice$ git log -p ..FETCH_HEAD</tt></pre>
+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.</p></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.
+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>
+<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">
+<div class="content">
+<pre><tt>$ gitk HEAD..FETCH_HEAD</tt></pre>
+</div></div>
+<div class="para"><p>This uses the same two-dot range notation we saw earlier with <em>git log</em>.</p></div>
+<div class="para"><p>Alice may want to view what both of them did since they forked.
+She can use three-dot form instead of the two-dot form:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ gitk HEAD...FETCH_HEAD</tt></pre>
+</div></div>
+<div class="para"><p>This means "show everything that is reachable from either one, but
+exclude anything that is reachable from both of them".</p></div>
+<div class="para"><p>Please note that these range notation can be used with both gitk
+and "git log".</p></div>
<div class="para"><p>After inspecting what Bob did, if there is nothing urgent, Alice may
decide to continue working without pulling from Bob. If Bob's history
does have something Alice would immediately need, Alice may choose to
@@ -881,7 +903,7 @@ digressions that may be interesting at this point are:</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-15 15:48:35 UTC
+Last updated 2008-08-29 08:56:32 UTC
</div>
</div>
</body>
|