From 0df3434818ed2fc0bf60acd6b5a3a925d95d349d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 22 Nov 2006 08:28:50 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4-g5942 --- tutorial.html | 4 ++-- tutorial.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tutorial.html b/tutorial.html index 2095a2842..9ef23928a 100644 --- a/tutorial.html +++ b/tutorial.html @@ -382,7 +382,7 @@ made on the experimental branch and you're back on the master branch.

$ 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
@@ -701,7 +701,7 @@ digressions that may be interesting at this point are:

diff --git a/tutorial.txt b/tutorial.txt index 554ee0af9..1e4ddfbd1 100644 --- a/tutorial.txt +++ b/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.26.2