From: Paolo Ciarrocchi Date: Mon, 20 Nov 2006 20:29:41 GMT Subject: [PATCH] Doc: Make comment about merging in tutorial.txt more clear Message-ID: <4d8e3fd30611201229y293aad01r1de2e4337a33c797@mail.gmail.com> Rephrased a sentence in order to make more clear the concept of pull . branch Signed-off-by: Paolo Ciarrocchi --- Documentation/tutorial.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 554ee0a..646395d 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -141,7 +141,7 @@ $ git commit -a ------------------------------------------------ at this point the two branches have diverged, with different changes -made in each. To merge the changes made in the two branches, run +made in each. To merge the changes did in experimental into master, run ------------------------------------------------ $ git pull . experimental -- 1.4.4.ge3d4 -- Paolo http://docs.google.com/View?docid=dhbdhs7d_4hsxqc8 http://www.linkedin.com/pub/0/132/9a3 Non credo nelle otto del mattino. Però esistono. Le otto del mattino sono l'incontrovertibile prova della presenza del male nel mondo. Gli ultimi giorni, Andrew Masterson From 1a4e078515547c346b5d6e8b74abcd24b20acb78 Mon Sep 17 00:00:00 2001 From: Paolo Ciarrocchi Date: Mon, 20 Nov 2006 21:25:47 +0100 Rephrased a sentence in order to make more clear the concept of pull . branch Signed-off-by: Paolo Ciarrocchi --- Documentation/tutorial.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 554ee0a..646395d 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -141,7 +141,7 @@ $ git commit -a ------------------------------------------------ at this point the two branches have diverged, with different changes -made in each. To merge the changes made in the two branches, run +made in each. To merge the changes did in experimental into master, run ------------------------------------------------ $ git pull . experimental -- 1.4.4.ge3d4