Merge branch 'lh/merge'

[git.git] / Documentation / tutorial.txt

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index f55d4083edd518a0dad26a37ac4d5c6877184c4f..fff1068c54e313efd4fb16a330c24d4749bc7712 100644 (file)
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -132,8 +132,8 @@ and newly modified files, and in both cases it takes a snapshot of the
 given files and stages that content in the index, ready for inclusion in
 the next commit.
 
 given files and stages that content in the index, ready for inclusion in
 the next commit.
 

-Viewing the changelog
----------------------
+Viewing project history
+-----------------------

 
 At any point you can view the history of your changes using
 
 
 At any point you can view the history of your changes using
 


@@ -304,7 +304,7 @@ it easier:
 $ git remote add bob /home/bob/myrepo
 ------------------------------------------------
 
 $ git remote add bob /home/bob/myrepo
 ------------------------------------------------
 

-With this, you can perform the first operation alone using the
+With this, Alice can perform the first operation alone using the

 "git fetch" command without merging them with her own branch,
 using:
 
 "git fetch" command without merging them with her own branch,
 using:
 


@@ -339,7 +339,7 @@ $ git pull . remotes/bob/master
 -------------------------------------
 
 Note that git pull always merges into the current branch,
 -------------------------------------
 
 Note that git pull always merges into the current branch,

-regardless of what else is given on the commandline.
+regardless of what else is given on the command line.

 
 Later, Bob can update his repo with Alice's latest changes using
 
 
 Later, Bob can update his repo with Alice's latest changes using
 


@@ -354,7 +354,7 @@ used for pulls:
 
 -------------------------------------
 $ git config --get remote.origin.url
 
 -------------------------------------
 $ git config --get remote.origin.url

-/home/bob/myrepo
+/home/alice/project

 -------------------------------------
 
 (The complete configuration created by git-clone is visible using
 -------------------------------------
 
 (The complete configuration created by git-clone is visible using