Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / Documentation / tutorial.txt

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 118ff72869bc8011cbfe46c2bdeed8c0e67e6ab6..fff1068c54e313efd4fb16a330c24d4749bc7712 100644 (file)
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -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