From: Santi Béjar Date: Wed, 3 Jan 2007 12:53:27 +0000 (+0100) Subject: Documentation/tutorial: misc updates X-Git-Tag: v1.5.0-rc1~103 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9c9410e115add56bc33a57f16c7e64da2e1fb0ec;p=git.git Documentation/tutorial: misc updates - Teach how to delete a branch with "git branch -d name". - Usually a commit has one parent; merge has more. - Teach "git show" instead of "git cat-file -p". Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano --- diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index aa8ea3079..79884d9c7 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -232,6 +232,15 @@ $ gitk will show a nice graphical representation of the resulting history. +At this point you could delete the experimental branch with + +------------------------------------------------ +$ git branch -d experimental +------------------------------------------------ + +This command ensures that the changes in the experimental branch are +already in the current branch. + If you develop on a branch crazy-idea, then regret it, you can always delete the branch with @@ -401,8 +410,8 @@ $ git show HEAD # the tip of the current branch $ git show experimental # the tip of the "experimental" branch ------------------------------------- -Every commit has at least one "parent" commit, which points to the -previous state of the project: +Every commit usually has one "parent" commit +which points to the previous state of the project: ------------------------------------- $ git show HEAD^ # to see the parent of HEAD @@ -520,10 +529,10 @@ of the file: $ git diff v2.5:Makefile HEAD:Makefile.in ------------------------------------- -You can also use "git cat-file -p" to see any such file: +You can also use "git show" to see any such file: ------------------------------------- -$ git cat-file -p v2.5:Makefile +$ git show v2.5:Makefile ------------------------------------- Next Steps