Add note about origin..master and master..origin as replacements for hg incoming...

[hgbook-git] / tour.mdwn

diff --git a/tour.mdwn b/tour.mdwn
index f5f4b85d55c7fd14e843f3f8e7d3bc2f7998bd12..3ba6af94849ea8ce77cecf54b1a18b25ec8e5847 100644 (file)
--- a/tour.mdwn
+++ b/tour.mdwn
@@ -279,20 +279,6 @@ The fields in a record of output from “git log” are as follows.
 The default output printed by “git log” is purely a summary; it is
 missing a lot of detail.
 
 The default output printed by “git log” is purely a summary; it is
 missing a lot of detail.
 

-Figure [2.1][8] provides a graphical representation of the history of
-the hello repository, to make it a little easier to see which
-direction history is “flowing” in. We’ll be returning to this figure
-several times in this chapter and the chapter that follows.
-
-* * *
-
-![PIC][9] 
-
-Figure 2.1: 
-Graphical history of the hello repository
-
-* * *
-

 #### 2.4.1  Commits, revisions, and talking to other people
 
 As English is a notoriously sloppy language, and computer science has
 #### 2.4.1  Commits, revisions, and talking to other people
 
 As English is a notoriously sloppy language, and computer science has


@@ -1014,6 +1000,22 @@ the common case for the upstream-tracking scenario), then "git pull"
 with no explicit repository is suffcient, and it will default to
 pulling from the same repository as the original clone.
 
 with no explicit repository is suffcient, and it will default to
 pulling from the same repository as the original clone.
 

+[XXX: The structure of the preceding section follows that of the
+original hgbook. But an alternate structure that arranged to pull from
+the originally cloned repository (as would be common) would allow for
+more straightforward use of git's features. For example, instead of
+the silly FETCH_HEAD stuff it would allow for "git fetch" and "git log
+master..origin" to be a very nice replacement for "hg
+incoming". Similarly, below, "git log origin..master" would make a
+nice replacement for "hg outgoing" which is something I didn't offer
+at all. One could also use git's remotes with the myriad repositories
+as used here, but it would require doing things like "git remote add
+<some-name> ../hello-pull" and that seems like a bit much to introduce
+for a turorial of this level. If nothing else, if the above section
+seems a little intimidating, understand that it's because things are
+not presented in the most natural "git way", (and I'm a little too
+tired to fix it tonight).]
+

 #### 2.8.2  Checking out previous revisions
 
 If any users of mercurial are reading this, they might wonder if
 #### 2.8.2  Checking out previous revisions
 
 If any users of mercurial are reading this, they might wonder if