Minor changes to exploring_code.md and rstudio.md

kbroman · kbroman · commit ea2da8a754ea · 2014-02-12T10:13:46.000-06:00
diff --git a/pages/exploring_code.md b/pages/exploring_code.md
@@ -19,11 +19,11 @@ See the
 Each commit is assigned a &ldquo;hash tag&rdquo; which is a unique
 sequence of letters and numbers, like
 [4d9fe11e56652bd19e19e28eac3906f09d5a3074](https://github.com/kbroman/github_tutorial/commit/4d9fe11e56652bd19e19e28eac3906f09d5a3074).
-When you refer to these hash tags, you can just use an initial substr,
+When you refer to these hash tags, you can just use an initial substring,
 like `4d9fe`, that is unique to your repository.
 
 For my [R/qtl package](http://github.com/kbroman/qtl), I like to tag
-particular commits by the version number of the package, then I can
+particular commits by the version number of the package. Then I can
 use my assigned tag in place of the less memorable hash tag.
 
 To assign a tag, use something like
@@ -76,9 +76,19 @@ And again you can use this for a particular file:
 
     git diff 1.22-21 1.23-16 inst/STATUS.txt
 
+`git diff` has a ton of options; see the manual page:
+
+    git diff --help
+    
+For example, you can get a brief summary of which files were changed with `--stat`:
+
+    git diff 1.22-21 1.23-16 --stat
+
 If you use [gitx](http://gitx.frim.nl/), you can use it to view the
 differences; use a pipe:
 
     git diff 1.22-21 1.23-16 | gitx
 
+
+
 **Next**: [Branching and merging](branching.html)
diff --git a/pages/rstudio.md b/pages/rstudio.md
@@ -7,7 +7,7 @@ title: git/github with RStudio
 environment for [R](http://www.r-project.org). 
 
 RStudio has built-in facilities for [knitr](http://yihui.name/knitr/)
-(the superb successor to [Sweave](http://www.stat.uni-muenchen.de/~leisch/Sweave/)) and [Rmarkdown](http://www.rstudio.com/ide/docs/r_markdown) (a
+(the superb successor to [Sweave](http://www.stat.uni-muenchen.de/~leisch/Sweave/)) and [R Markdown](http://www.rstudio.com/ide/docs/r_markdown) (a
 variant of
 [Markdown](http://daringfireball.net/projects/markdown/syntax)), which
 are highly recommended for writing data analysis reports.
@@ -21,7 +21,7 @@ Basically, in RStudio you want to create a Project
 ([described further here](http://www.rstudio.com/ide/docs/using/projects)),
 which is basically a directory with some special files to describe
 project-specific RStudio options. This Project will be your git
-repository. Or you can easily make a current git repository into an
+repository. Or you can easily turn a current git repository into an
 RStudio Project. And then you can use items in the menu bar to commit
 changes and push or pull from GitHub.
 
