On Tue, Aug 26, 2008 at 2:29 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: [...] > With the existing flow, I would actually suggest you not to use > origin/master at all. The example before you inserted your changes does > not update origin/master. > > Alice can use gitk to compare what both of them did: > > $ gitk HEAD FETCH_HEAD > > then teach the limiting: > > Notice unlike the earlier example that you used gitk to view the > history leading to current status, this shows both histories > leading to Alice's current state (HEAD) and the state you just > fetched from Bob (FETCH_HEAD). You can limit what is shown by > using revision range notation: > > $ 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 already knows > what she did well, as well as what she and Bob started working on, > and she is only interested in what Bob did since their histories > forked, working independently. > > By the way, the notation "git log -p ..FETCH_HEAD" you saw > earlier is a short-hand for "git log -p HEAD..FETCH_HEAD". HEAD, > that means your current state, can be dropped on either side of > the two-dot range notation. > > It might be better to remove the last paragraph, and instead explain the > meaning of "..FETCH_HEAD" notation immediately after "git log -p" was used > to "fetch-review-but-not-integrate" description (i.e. before the part your > patch touched). > > If you want to, you can also teach three-dot form after showing how to use > the two-dot form. > > 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". > > Again, note that these range notation can be used with both gitk > and "git log". > Maybe something like that? Not intended to be applied, probably manglade and with no sob. Just for discussion: diff --git a/gittutorial.txt.txt b/gittutorial.txt.txt index 48d1454..4f6d4e9 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 historie 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
