X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=src%2Fhgbook-git%2Ftour.mdwn;h=87f9733dc81a0922c13f0267739565473aaddb65;hb=eaab0bad4f327090d9bc682c278ac3e9f9657de2;hp=a90efd8ffc6b7870daeb01b0eabccc41ec147d90;hpb=999b531894b91df6165a749ede556a1bff25ae1e;p=cworth.org diff --git a/src/hgbook-git/tour.mdwn b/src/hgbook-git/tour.mdwn index a90efd8..87f9733 100644 --- a/src/hgbook-git/tour.mdwn +++ b/src/hgbook-git/tour.mdwn @@ -822,6 +822,16 @@ that tell me something that I can’t figure out with a quick glance at the output of "git log --stat" or “git log -p", (so repeating the list of all modified files is not useful, for example). +To follow along with the example here, go ahead and type something +like the following sentence into the editor. The misspelling here is +intentional. You'll see how to fix that up after the fact in just a +moment: + + Fixed the typo so the program actuall complies now. + +Then save the file, and exit from the editor. When you do that, git +will create the commit. + #### 2.7.4 Aborting a commit If you decide that you don’t want to commit while in the middle of @@ -869,13 +879,13 @@ identifier shown above. Can you do it?) So now that we've cloned a local repository, made a change to the code, setup our name and email address, and made a careful commit, we're just about ready to share our change with the world. But wait, -that commit message has some really embarrassing misspellings in -it. Wouldn't it be nice to touch those up before I post this commit +that commit message has that embarrassing misspelling in +it. Wouldn't it be nice to touch that up before we post this commit with a never-to-be-changed again commit identifier? This is the exact situation for which "git commit --amend" was -invented. So I can just run that now and fix the broken commit -message: +invented. So you can just run that now and fix the broken commit +message in the editor: $ git commit --amend