Skip to contentSkip to conversation

tutorial: Use "git merge" instead of "git pull ."

PATCH In review Santi Béjar 1 participant 1 message Jun 15, 2016 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 tutorial: Use "git merge" instead of "git pull ."

---
 Documentation/tutorial.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Documentation/tutorial.txt +3 -3
index 4b7eba3..45abfa5 100644
@@ -211,7 +211,7 @@ at this point the two branches have diverged, with different changes
 made in each.  To merge the changes made in experimental into master, run
 
 ------------------------------------------------
-$ git pull . experimental
+$ git merge experimental
 ------------------------------------------------
 
 If the changes don't conflict, you're done.  If there are conflicts,
@@ -320,10 +320,10 @@ could pull the changes into her master branch:
 
 -------------------------------------
 $ git checkout master
-$ git pull . remotes/bob/master
+$ git merge bob/master
 -------------------------------------
 
-The last command is a pull from the "bob/master" branch in Alice's
+The last command is a merge of the "bob/master" branch in Alice's
 own repository.
 
 Alice could also perform both steps at once with:
Signature · 1 line
1.5.0-rc1.GIT