From bb4386f58c87854098784df6e11b8aeaed23af99 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Fri, 28 Sep 2007 01:20:38 -0700 Subject: [PATCH] Add note about origin..master and master..origin as replacements for hg incoming/outgoing --- tour.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tour.mdwn b/tour.mdwn index b5bbe6e..3ba6af9 100644 --- a/tour.mdwn +++ b/tour.mdwn @@ -1000,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. +[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 + ../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.43.0