From: Paolo Ciarrocchi Date: Mon, 20 Nov 2006 20:29:41 +0000 (+0100) Subject: Doc: Make comment about merging in tutorial.txt more clear X-Git-Tag: v1.4.4.1~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=594270635732d6320d6e6d7fa127679ae90ef5b1;p=git.git Doc: Make comment about merging in tutorial.txt more clear Rephrased a sentence in order to make more clear the concept of pull . branch Signed-off-by: Paolo Ciarrocchi Signed-off-by: Junio C Hamano --- diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 554ee0af9..1e4ddfbd1 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 made in experimental into master, run ------------------------------------------------ $ git pull . experimental