@@ -321,10 +321,37 @@ pulling, like this:
321
321
322
322
------------------------------------------------
323
323
alice$ git fetch /home/bob/myrepo master
324
- alice$ git log -p ..FETCH_HEAD
324
+ alice$ git log -p HEAD ..FETCH_HEAD
325
325
------------------------------------------------
326
326
327
327
This operation is safe even if Alice has uncommitted local changes.
328
+ The range notation HEAD..FETCH_HEAD" means "show everything that is reachable
329
+ from the FETCH_HEAD but exclude anything that is reachable from HEAD.
330
+ Alice already knows everything that leads to her current state (HEAD),
331
+ and reviewing what Bob has in his state (FETCH_HEAD) that she has not
332
+ seen with this command
333
+
334
+ If Alice wants to visualize what Bob did since their histories forked
335
+ she can issue the following command:
336
+
337
+ ------------------------------------------------
338
+ $ gitk HEAD..FETCH_HEAD
339
+ ------------------------------------------------
340
+
341
+ This uses the same two-dot range notation we saw earlier with 'git log'.
342
+
343
+ Alice may want to view what both of them did since they forked.
344
+ She can use three-dot form instead of the two-dot form:
345
+
346
+ ------------------------------------------------
347
+ $ gitk HEAD...FETCH_HEAD
348
+ ------------------------------------------------
349
+
350
+ This means "show everything that is reachable from either one, but
351
+ exclude anything that is reachable from both of them".
352
+
353
+ Please note that these range notation can be used with both gitk
354
+ and "git log".
328
355
329
356
After inspecting what Bob did, if there is nothing urgent, Alice may
330
357
decide to continue working without pulling from Bob. If Bob's history
0 commit comments