X-Git-Url: https://git.cworth.org/git?p=cworth.org;a=blobdiff_plain;f=src%2Fhgbook-git%2Ftour.mdwn;h=a8a891ad8e2021284e21115b7fbe83573246c96a;hp=87f9733dc81a0922c13f0267739565473aaddb65;hb=caa20a8492544c9ee3f44ab071c851352536f065;hpb=eaab0bad4f327090d9bc682c278ac3e9f9657de2 diff --git a/src/hgbook-git/tour.mdwn b/src/hgbook-git/tour.mdwn index 87f9733..a8a891a 100644 --- a/src/hgbook-git/tour.mdwn +++ b/src/hgbook-git/tour.mdwn @@ -1,4 +1,4 @@ -[[meta title="A tour of git: the basics"]] +[[!meta title="A tour of git: the basics"]] A tour of git: the basics ### 2.0 Copyright @@ -120,9 +120,9 @@ times when you find yourself stuck trying to remember how to run a command. If you are completely stuck, simply run “git help”; it will print a brief list of commonly-used commands, along with a description of what each does. If you ask for help on a specific command (such as -"git help init"), it prints more detailed information. [XXX: Does `git -help ` work universally as a built-in or does it expect man to be -present and just call out to `man git-`?] +"git help init"), it prints more detailed information. This command +expects the "man" program to be available and for the git man pages to +be installed. [XXX: The original hgbook includes the complete output of "hg help init" at this point. I'm not including the corresponding @@ -132,7 +132,7 @@ present and just call out to `man git-`?] but it only comes after a full screen's worth of options details. Might it make sense to have a more summarized help output for "git help " than all of the documentation - available for git-? And perhaps alos provide a "git -v + available for git-? And perhaps also provide a "git -v help" similar to "hg -v help" for more?] ### 2.3 Working with a repository @@ -234,7 +234,7 @@ discussing how to move commits between repositories: $ git clone hello hello-fetch $ git clone hello hello-remote -#### 2.3.2 What’s in a repository? +#### 2.3.3 What’s in a repository? When we take a more detailed look inside a repository, we can see that it contains a directory named .git. This is where git keeps all @@ -1067,7 +1067,7 @@ Another helpful way of visualizing what happened with "git fetch" here is to run "gitk --all", which gives a graphical representation of all branches. Here is what it would look like: -[[img gitk-fetch.png]] +[[!img gitk-fetch.png]] Notice that origin/master points to a single commit that was committed on top of the state pointed to by the "master" branch.