summaryrefslogtreecommitdiff
path: root/Documentation/tutorial.txt
diff options
context:
space:
mode:
authorSanti Béjar <sbejar@gmail.com>2007-01-03 12:53:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-03 20:19:20 (GMT)
commit9c9410e115add56bc33a57f16c7e64da2e1fb0ec (patch)
tree8adadbccbe1daee09534df4b0e8274f2ddc508b6 /Documentation/tutorial.txt
parentc1d179f88add2a8c1e0052d34cf757760c25b8df (diff)
downloadgit-9c9410e115add56bc33a57f16c7e64da2e1fb0ec.zip
git-9c9410e115add56bc33a57f16c7e64da2e1fb0ec.tar.gz
git-9c9410e115add56bc33a57f16c7e64da2e1fb0ec.tar.bz2
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 <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/tutorial.txt')
-rw-r--r--Documentation/tutorial.txt17
1 files changed, 13 insertions, 4 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index aa8ea30..79884d9 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