Merge branch 'lh/merge'

[git.git] / Documentation / tutorial.txt

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