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.txt | |
parent | f9e04eb9a776f91e487bc56bd35c2d6cff4a4cc3 (diff) | |
download | git-htmldocs-a387df351c783f68378511c35d12d637498c7211.tar.gz |
Autogenerated HTML docs for v1.6.0.1-141-g445ca
Diffstat (limited to 'gittutorial.txt')
-rw-r--r-- | gittutorial.txt | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/gittutorial.txt b/gittutorial.txt index 48d1454a9..384972cb9 100644 --- a/gittutorial.txt +++ b/gittutorial.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 |