Doc: Make comment about merging in tutorial.txt more clear
authorPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Mon, 20 Nov 2006 20:29:41 +0000 (21:29 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 22 Nov 2006 03:01:29 +0000 (19:01 -0800)
Rephrased a sentence in order to make more clear the concept of
pull . branch

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/tutorial.txt
index 554ee0af912368cb842d93c025e742daaf47f5f2..1e4ddfbd114dde8949dc53d423715673a748854f 100644 (file)
@@ -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