{"thread":{"id":"43637","subject":"[PATCH] Doc: Make comment about merging in tutorial.txt more clear","startedAt":"2006-11-20T20:29:41Z","lastAt":"2006-11-20T20:29:41Z","messageCount":1,"participants":["Paolo Ciarrocchi"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"296179","messageId":"4d8e3fd30611201229y293aad01r1de2e4337a33c797@mail.gmail.com","threadId":"43637","inReplyTo":null,"subject":"[PATCH] Doc: Make comment about merging in tutorial.txt more clear","fromName":"Paolo Ciarrocchi","fromEmail":"paolo.ciarrocchi@gmail.com","sentAt":"2006-11-20T20:29:41Z","receivedAt":"2006-11-20T20:29:41Z","isPatch":true,"sender":{"key":"paolo.ciarrocchi@gmail.com","avatar":null},"body":"Rephrased a sentence in order to make more clear the concept of\npull . branch\n\nSigned-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n---\n Documentation/tutorial.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex 554ee0a..646395d 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -141,7 +141,7 @@ $ git commit -a\n ------------------------------------------------\n\n at this point the two branches have diverged, with different changes\n-made in each.  To merge the changes made in the two branches, run\n+made in each.  To merge the changes did in experimental into master, run\n\n ------------------------------------------------\n $ git pull . experimental\n-- \n1.4.4.ge3d4\n\n\n-- \nPaolo\nhttp://docs.google.com/View?docid=dhbdhs7d_4hsxqc8\nhttp://www.linkedin.com/pub/0/132/9a3\nNon credo nelle otto del mattino. Però esistono. Le otto del mattino\nsono l'incontrovertibile prova della presenza del male nel mondo.\nGli ultimi giorni, Andrew Masterson\n\n\nFrom 1a4e078515547c346b5d6e8b74abcd24b20acb78 Mon Sep 17 00:00:00 2001\nFrom: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\nDate: Mon, 20 Nov 2006 21:25:47 +0100\n\nRephrased a sentence in order to make more clear the concept of\npull . branch\n\nSigned-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n---\n Documentation/tutorial.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex 554ee0a..646395d 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -141,7 +141,7 @@ $ git commit -a\n ------------------------------------------------\n \n at this point the two branches have diverged, with different changes\n-made in each.  To merge the changes made in the two branches, run\n+made in each.  To merge the changes did in experimental into master, run\n \n ------------------------------------------------\n $ git pull . experimental\n-- \n1.4.4.ge3d4\n\n"}]}