On Tue, Aug 26, 2008 at 10:45 AM, Paolo Ciarrocchi
<paolo.ciarrocchi@xxxxxxxxx> wrote:
> On Tue, Aug 26, 2008 at 10:24 AM, Eric Raible <raible@xxxxxxxxx> wrote:
>> On Tue, Aug 26, 2008 at 1:16 AM, Paolo Ciarrocchi
>> <paolo.ciarrocchi@xxxxxxxxx> wrote:
>>> +If Alice wants to visualize what Bob did since their historie forked
>>
>> s/historie/histories/
>
> Thanks, fixed.
commit 83f4407bb8e8785d7fc62119010d1412e7cd6508
Author: Paolo Ciarrocchi <paolo.ciarrocchi@xxxxxxxxx>
Date: Tue Aug 26 10:13:36 2008 +0200
Gittutorial update.
Changes to gitturolia according to the discussion on
the git mailing list
diff --git a/gittutorial.txt.txt b/gittutorial.txt.txt
index 48d1454..279ca46 100644
--- a/gittutorial.txt.txt
+++ b/gittutorial.txt.txt
@@ -321,10 +321,51 @@ pulling, like this:
------------------------------------------------
alice$ git fetch /home/bob/myrepo master
-alice$ git log -p ..FETCH_HEAD
+alice$ git log -p HEAD..FETCH_HEAD
------------------------------------------------
This operation is safe even if Alice has uncommitted local changes.
+Note that HEAD, that means your current state, can be dropped on either
+side of the two-dot range notation.
+This means that Alice can also inspect what Bod did issuing the following
+command:
+
+------------------------------------------------
+alice$ git log -p ..FETCH_HEAD
+------------------------------------------------
+
+Alice can use gitk to compare what both of them did:
+
+------------------------------------------------
+$ gitk HEAD FETCH_HEAD
+------------------------------------------------
+
+This shows both histories leading to Alice's current state (HEAD) and the
+state Alice just fetched from Bob (FETCH_HEAD).
+
+If Alice wants to visualize what Bob did since their histories forked
+she can issue the following command:
+
+------------------------------------------------
+$ gitk HEAD..FETCH_HEAD
+------------------------------------------------
+
+Two commits written with two dots in between means "show
+everything that is reachable from the latter but excluding
+anything that is reachable from the former".
+
+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:
+
+------------------------------------------------
+$ gitk HEAD...FETCH_HEAD
+------------------------------------------------
+
+This means "show everything that is reachable from either one, but
+exclude anything that is reachable from both of them".
+
+Please note that these range notation can be used with both gitk
+and "git log".
After inspecting what Bob did, if there is nothing urgent, Alice may
decide to continue working without pulling from Bob. If Bob's history
Ciao,
--
Paolo
http://paolo.ciarrocchi.googlepages.com/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
