-[[meta title="A tour of git: the basics"]]
+[[!meta title="A tour of git: the basics"]]
A tour of git: the basics
### 2.0 Copyright
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
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
is to run "gitk --all", which gives a graphical representation of all
branches. Here is what it would look like:
-[[img gitk-fetch.png]]
+[[!img gitk-fetch.png]]
Notice that origin/master points to a single commit that was committed
on top of the state pointed to by the "master" branch.