X-Git-Url: https://git.cworth.org/git?p=hgbook-git;a=blobdiff_plain;f=tour.mdwn;h=d07a469b3494e32b949a9e35cd5bd90db5e41b50;hp=85ebedd27070584083899d8f01c9a1f77a0d1783;hb=HEAD;hpb=5be8308649310ef4c6ac6088ad16472b841e3a31 diff --git a/tour.mdwn b/tour.mdwn index 85ebedd..d07a469 100644 --- a/tour.mdwn +++ b/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 @@ -935,9 +945,8 @@ helpful when the commit it isolates is as small as possible. One advantage of using git over some other systems is that the commit speed is blazingly fast. The tool doesn't punish you at all for -committing as often as you get our project into a state that is worth -saving. "Commit early, commit often" is a well-supported mode of -operation with git. +committing every time your project is in a state worth saving. "Commit +early, commit often" is a well-supported mode of operation with git. ### 2.8 Sharing changes