From 594270635732d6320d6e6d7fa127679ae90ef5b1 Mon Sep 17 00:00:00 2001 From: Paolo Ciarrocchi Date: Mon, 20 Nov 2006 21:29:41 +0100 Subject: [PATCH] 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 --- Documentation/tutorial.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 554ee0af91..1e4ddfbd11 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 -- 2.11.4.GIT