diff options
| author |  Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> | 2006-11-20 21:29:41 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-11-21 19:01:29 -0800 |
| commit | 594270635732d6320d6e6d7fa127679ae90ef5b1 (patch) | |
| tree | 0371e89bfac77555d06bf8616c9909d4d49b6ae8 | |
| parent | archive: use setvbuf() instead of setlinebuf() (diff) | |
| download | tgif-594270635732d6320d6e6d7fa127679ae90ef5b1.tar.xz | |
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>
| -rw-r--r-- | Documentation/tutorial.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |