{"thread":{"id":"6201","subject":"[PATCH] Documentation/tutorial: misc updates","startedAt":"2007-01-03T12:53:27Z","lastAt":"2007-01-03T12:53:27Z","messageCount":1,"participants":["Santi Béjar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"30745","messageId":"87fyastgoo.fsf@gmail.com","threadId":"6201","inReplyTo":null,"subject":"[PATCH] Documentation/tutorial: misc updates","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-01-03T12:53:27Z","receivedAt":"2007-01-03T12:53:27Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"\nThree changes:\n1) Teach how to delete a branch with \"git branch -d name\".\n2) The first commit does not have a parent.\n3) Teach \"git show\" instead of \"git cat-file -p\".\n---\n Documentation/tutorial.txt |   17 +++++++++++++----\n 1 files changed, 13 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex d043e84..f0a5526 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -222,6 +222,15 @@ $ gitk\n \n will show a nice graphical representation of the resulting history.\n \n+At this point you could delete the experimental branch with\n+\n+------------------------------------------------\n+$ git branch -d experimental\n+------------------------------------------------\n+\n+This command ensures that the changes in the experimental branch are\n+already in the current branch.\n+\n If you develop on a branch crazy-idea, then regret it, you can always\n delete the branch with\n \n@@ -391,8 +400,8 @@ $ git show HEAD\t\t# the tip of the current branch\n $ git show experimental\t# the tip of the \"experimental\" branch\n -------------------------------------\n \n-Every commit has at least one \"parent\" commit, which points to the\n-previous state of the project:\n+Every commit has at least one \"parent\" commit (except the first),\n+which points to the previous state of the project:\n \n -------------------------------------\n $ git show HEAD^  # to see the parent of HEAD\n@@ -510,10 +519,10 @@ of the file:\n $ git diff v2.5:Makefile HEAD:Makefile.in\n -------------------------------------\n \n-You can also use \"git cat-file -p\" to see any such file:\n+You can also use \"git show\" to see any such file:\n \n -------------------------------------\n-$ git cat-file -p v2.5:Makefile\n+$ git show v2.5:Makefile\n -------------------------------------\n \n Next Steps\n-- \n1.5.0.rc0.g91ea\n"}]}