git-tar-tree: documentation update

[git.git] / Documentation / core-tutorial.txt

diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt
index c3eaa38..1185897 100644 (file)
--- a/Documentation/core-tutorial.txt
+++ b/Documentation/core-tutorial.txt
@@ -1,5 +1,5 @@
-A short git tutorial
-====================
+A git core tutorial for developers
+==================================

 
 Introduction
 ------------
 
 Introduction
 ------------


@@ -184,7 +184,7 @@ $ git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238
 ----------------
 
 where the `-t` tells `git-cat-file` to tell you what the "type" of the
 ----------------
 
 where the `-t` tells `git-cat-file` to tell you what the "type" of the

-object is. git will tell you that you have a "blob" object (ie just a
+object is. git will tell you that you have a "blob" object (i.e., just a

 regular file), and you can see the contents with
 
 ----------------
 regular file), and you can see the contents with
 
 ----------------


@@ -619,7 +619,7 @@ $ git tag -s <tagname>
 ----------------
 
 which will sign the current `HEAD` (but you can also give it another
 ----------------
 
 which will sign the current `HEAD` (but you can also give it another

-argument that specifies the thing to tag, ie you could have tagged the
+argument that specifies the thing to tag, i.e., you could have tagged the

 current `mybranch` point by using `git tag <tagname> mybranch`).
 
 You normally only do signed tags for major releases or things
 current `mybranch` point by using `git tag <tagname> mybranch`).
 
 You normally only do signed tags for major releases or things


@@ -852,7 +852,7 @@ that branch, and do some work there.
 ------------------------------------------------
 $ git checkout mybranch
 $ echo "Work, work, work" >>hello
 ------------------------------------------------
 $ git checkout mybranch
 $ echo "Work, work, work" >>hello

-$ git commit -m 'Some work.' hello
+$ git commit -m 'Some work.' -i hello

 ------------------------------------------------
 
 Here, we just added another line to `hello`, and we used a shorthand for
 ------------------------------------------------
 
 Here, we just added another line to `hello`, and we used a shorthand for


@@ -877,7 +877,7 @@ hasn't happened in the `master` branch at all. Then do
 ------------
 $ echo "Play, play, play" >>hello
 $ echo "Lots of fun" >>example
 ------------
 $ echo "Play, play, play" >>hello
 $ echo "Lots of fun" >>example

-$ git commit -m 'Some fun.' hello example
+$ git commit -m 'Some fun.' -i hello example

 ------------
 
 since the master branch is obviously in a much better mood.
 ------------
 
 since the master branch is obviously in a much better mood.


@@ -942,7 +942,7 @@ Work, work, work
 and once you're happy with your manual merge, just do a
 
 ------------
 and once you're happy with your manual merge, just do a
 
 ------------

-$ git commit hello
+$ git commit -i hello

 ------------
 
 which will very loudly warn you that you're now committing a merge
 ------------
 
 which will very loudly warn you that you're now committing a merge


@@ -971,7 +971,7 @@ $ git show-branch --topo-order master mybranch
 The first two lines indicate that it is showing the two branches
 and the first line of the commit log message from their
 top-of-the-tree commits, you are currently on `master` branch
 The first two lines indicate that it is showing the two branches
 and the first line of the commit log message from their
 top-of-the-tree commits, you are currently on `master` branch

-(notice the asterisk `*` character), and the first column for
+(notice the asterisk `\*` character), and the first column for

 the later output lines is used to show commits contained in the
 `master` branch, and the second column for the `mybranch`
 branch. Three commits are shown along with their log messages.
 the later output lines is used to show commits contained in the
 `master` branch, and the second column for the `mybranch`
 branch. Three commits are shown along with their log messages.


@@ -1097,7 +1097,7 @@ commit object by downloading from `repo.git/objects/xx/xxx\...`
 using the object name of that commit object.  Then it reads the
 commit object to find out its parent commits and the associate
 tree object; it repeats this process until it gets all the
 using the object name of that commit object.  Then it reads the
 commit object to find out its parent commits and the associate
 tree object; it repeats this process until it gets all the

-necessary objects.  Because of this behaviour, they are
+necessary objects.  Because of this behavior, they are

 sometimes also called 'commit walkers'.
 +
 The 'commit walkers' are sometimes also called 'dumb
 sometimes also called 'commit walkers'.
 +
 The 'commit walkers' are sometimes also called 'dumb