X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Ftutorial-2.txt;h=894ca5e06f26002f7dc5f2a16b713ca13e45886e;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=08d3453e5c100e3d154e949363339ac68c263a41;hpb=0a2586c807fadc4b13a741e693471765870f6bb4;p=git.git diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt index 08d3453e..894ca5e0 100644 --- a/Documentation/tutorial-2.txt +++ b/Documentation/tutorial-2.txt @@ -49,7 +49,7 @@ tree A tree can refer to one or more "blob" objects, each corresponding to a file. In addition, a tree can also refer to other tree objects, -thus creating a directory heirarchy. You can examine the contents of +thus creating a directory hierarchy. You can examine the contents of any tree using ls-tree (remember that a long enough initial portion of the SHA1 will also work): @@ -136,7 +136,7 @@ The "tree" object here refers to the new state of the tree: ------------------------------------------------ $ git ls-tree d0492b36 100644 blob a0423896973644771497bdc03eb99d5281615b51 file.txt -$ git cat-file commit a0423896 +$ git cat-file blob a0423896 hello world! ------------------------------------------------ @@ -377,7 +377,7 @@ At this point you should know everything necessary to read the man pages for any of the git commands; one good place to start would be with the commands mentioned in link:everyday.html[Everyday git]. You should be able to find any unknown jargon in the -link:glossary.html[Glosssay]. +link:glossary.html[Glossary]. The link:cvs-migration.html[CVS migration] document explains how to import a CVS repository into git, and shows how to use git in a