X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Ftutorial.txt;h=1e4ddfbd114dde8949dc53d423715673a748854f;hb=9b8dc263e1b0d470cc67a824837d8884ae3e7136;hp=db563127b236757de62be50a4e04439eddf2729e;hpb=731651fe25a7d7a242584e4b85112a610c32a23f;p=git.git diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index db563127b..1e4ddfbd1 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 @@ -357,7 +357,7 @@ $ git diff v2.5 HEAD # compare the current HEAD to v2.5 $ git branch stable v2.5 # start a new branch named "stable" based # at v2.5 $ git reset --hard HEAD^ # reset your current branch and working - # directory its state at HEAD^ + # directory to its state at HEAD^ ------------------------------------- Be careful with that last command: in addition to losing any changes