summaryrefslogtreecommitdiff
path: root/Documentation/tutorial.txt
diff options
context:
space:
mode:
authorPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>2006-11-20 20:29:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-22 03:01:29 (GMT)
commit594270635732d6320d6e6d7fa127679ae90ef5b1 (patch)
tree0371e89bfac77555d06bf8616c9909d4d49b6ae8 /Documentation/tutorial.txt
parentaa9098611fb53e4e9d33757102f96145946811f4 (diff)
downloadgit-594270635732d6320d6e6d7fa127679ae90ef5b1.zip
git-594270635732d6320d6e6d7fa127679ae90ef5b1.tar.gz
git-594270635732d6320d6e6d7fa127679ae90ef5b1.tar.bz2
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 <paolo.ciarrocchi@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/tutorial.txt')
-rw-r--r--Documentation/tutorial.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 554ee0a..1e4ddfb 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