{"thread":{"id":"6351","subject":"[PATCH 2/2] tutorial: Use \"git merge\" instead of \"git pull .\"","startedAt":"2007-01-12T11:58:21Z","lastAt":"2007-01-12T11:58:21Z","messageCount":1,"participants":["Santi Béjar"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"31551","messageId":"87odp4319e.fsf@gmail.com","threadId":"6351","inReplyTo":null,"subject":"[PATCH 2/2] tutorial: Use \"git merge\" instead of \"git pull .\"","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-01-12T11:58:21Z","receivedAt":"2007-01-12T11:58:21Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"\n\nSigned-off-by: Santi Béjar <sbejar@gmail.com>\n---\n Documentation/tutorial.txt |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex 4b7eba3..45abfa5 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -211,7 +211,7 @@ at this point the two branches have diverged, with different changes\n made in each.  To merge the changes made in experimental into master, run\n \n ------------------------------------------------\n-$ git pull . experimental\n+$ git merge experimental\n ------------------------------------------------\n \n If the changes don't conflict, you're done.  If there are conflicts,\n@@ -320,10 +320,10 @@ could pull the changes into her master branch:\n \n -------------------------------------\n $ git checkout master\n-$ git pull . remotes/bob/master\n+$ git merge bob/master\n -------------------------------------\n \n-The last command is a pull from the \"bob/master\" branch in Alice's\n+The last command is a merge of the \"bob/master\" branch in Alice's\n own repository.\n \n Alice could also perform both steps at once with:\n-- \n1.5.0-rc1.GIT\n"}]}