Permalink
Browse files

Merge pull request #388 from elysdir/master

Adding a missing word
  • Loading branch information...
2 parents 24bff5e + da734f4 commit 5c50c45c70cded4b69111b0b1c2e784ce027a977 @jnavila jnavila committed Mar 21, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 en/02-git-basics/01-chapter2.markdown
@@ -551,7 +551,7 @@ Table 2-1 lists some of the more useful options that format takes.
You may be wondering what the difference is between _author_ and _committer_. The _author_ is the person who originally wrote the patch, whereas the _committer_ is the person who last applied the patch. So, if you send in a patch to a project and one of the core members applies the patch, both of you get credit — you as the author and the core member as the committer. We’ll cover this distinction a bit more in *Chapter 5*.
-The `oneline` and `format` options are particularly useful with another `log` option called `--graph`. This option adds a nice little ASCII graph showing your branch and merge history, which we can see our copy of the Grit project repository:
+The `oneline` and `format` options are particularly useful with another `log` option called `--graph`. This option adds a nice little ASCII graph showing your branch and merge history, which we can see in our copy of the Grit project repository:
$ git log --pretty=format:"%h %s" --graph
* 2d3acf9 ignore errors from SIGCHLD on trap

0 comments on commit 5c50c45

Please sign in to comment.