On Tue, Aug 26, 2008 at 8:13 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > "Paolo Ciarrocchi" <paolo.ciarrocchi@xxxxxxxxx> writes: [...] > So here are the tweaks I would suggest: > > * Show only "git log -p HEAD..FETCH_HEAD" here; OK. > * After "This operation is safe ... local changes.", say "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"; Makes sense. > * Drop "This means..." and "log -p ..FETCH" example; OK. > * Replace the explanation for the two-dot range notation after "gitk > HEAD..FETCH_HEAD" with "This uses the same two-dot range notation we > saw earlier with 'git log'". > > * And finally, if we wanted to, we can top about omission of HEAD in > either end of the range notation. Just before "Please note that these > range notation...", say "Because viewing range between your current > state and something else is common, you can omit HEAD from either side > of two- or three-dot range notation. I.e. 'git log ..FETCH_HEAD' is a > shorthand for 'git log HEAD..FETCH_HEAD', and 'gitk ...FETCH_HEAD' is a > shorthand for 'gitk HEAD...FETCH_HEAD'. Right now I dind't mention the shorthand, I'm not sure whether it's worth to mention it in this first tutorial. What do you think of this whitespace damaged patch? BTW, does anybody know if/how to inline a patch using the web interface of Gmail? --8<--- diff --git a/gittutorial.txt.txt b/gittutorial.txt.txt index 48d1454..384972c 100644 --- a/gittutorial.txt.txt +++ b/gittutorial.txt.txt @@ -321,10 +321,37 @@ 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. +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 + +If Alice wants to visualize what Bob did since their histories forked +she can issue the following command: + +------------------------------------------------ +$ gitk HEAD..FETCH_HEAD +------------------------------------------------ + +This uses the same two-dot range notation we saw earlier with 'git log'. + +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 --8<--- -- 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
