development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 19:17:52 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

tutorial: gentler illustration of Alice/Bob workflow using gitk

Browse source 
Update to gitutorial as discussedin the git mailing list:

http://marc.info/?t=121969390900002&r=1&w=2

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Paolo Ciarrocchi 2008-08-28 14:23:52 +02:00 committed by Junio C Hamano
parent d36f8679e9
commit 53d1589ff6
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Documentation/gittutorial.txt
View file

@ -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