Skip to content

Commit

Permalink
Stop numbering files, Act Four
Browse files Browse the repository at this point in the history
  • Loading branch information
jennybc committed Jan 8, 2019
1 parent 21312ba commit 7e178b9
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 11 deletions.
2 changes: 1 addition & 1 deletion 90_references.Rmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
`r if (knitr:::is_html_output()) '# References'`

### Resources
### Resources {#resources}

We practice what we preach! This site is created with Git and R markdown, using the [`bookdown`](https://github.com/rstudio/bookdown/) package. Go ahead and [peek behind the scenes](https://github.com/jennybc/happy-git-with-r).

Expand Down
9 changes: 5 additions & 4 deletions _bookdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ rmd_files: [
"usage-rmd-and-github.Rmd",
"usage-r-script-and-github.Rmd",

"33_git-commands.Rmd",
## TODO: commit, diff
"35_git-branches.Rmd",
"36_git-remotes.Rmd",
"git-intro.Rmd",
## TODO: commit, diff
"git-commands.Rmd",
"git-branches.Rmd",
"git-remotes.Rmd",

"40_workflow-pull.Rmd",
"49_workflow-explore-extend-pull-request.Rmd",
Expand Down
2 changes: 1 addition & 1 deletion 35_git-branches.Rmd → git-branches.Rmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Branches {#branches}
# Branches {#git-branches}

Branching means that you take a detour from the main stream of development and
do work without changing the main stream. It allows one or many people to work
Expand Down
6 changes: 2 additions & 4 deletions 33_git-commands.Rmd → git-commands.Rmd
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# (PART) Git basics and workflows {-}
# Git commands {#git-commands}

# Git commands {#usage-git-cmds}

Here's a start on the various Git commands that have been largely going on under the hood. We've tried to pick workflows that have RStudio doing this for us. But all of this can be done from the command line.
A collection of some of the Git commands that have been largely going on under the hood. We've emphasized early workflows that are possible in RStudio. But all of this and much more can be done from the command line. This list is here mostly so we can consult it during live workshops if needed.

*Unless you use the [GitHub API](https://developer.github.com/v3/), most of the GitHub bits really have to be done from the browser.*

Expand Down
13 changes: 13 additions & 0 deletions git-intro.Rmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# (PART) Basic Git concepts {-}

# Some Git basics {#git-intro .unnumbered}

We've told you shockingly little about Git so far! To a large extent, this is by design. There are lots of [general Git resources](#resources) out there that do a great job explaining the core concepts and terminology. Happy Git is designed to fill what we see as some gaps:

* A "batteries included" guide for early success with basic workflows.
* Advice on how to use Git/GitHub in data science, which differs from pure software development in several aspects.
* Special considerations relevant to people who use R and RStudio.

In live workshops, we also intoduce the most important basic ideas in the context of guided activities.

This part collects anything we've written about core Git concepts, is a work in progress, and should be used to complement [external Git resources](#resources).
2 changes: 1 addition & 1 deletion 36_git-remotes.Rmd → git-remotes.Rmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Remotes {#remotes}
# Remotes {#git-remotes}

Remote repositories are versions of your project that are hosted on the
Internet or another network. A single project can have 1, 2 or even hundreds of
Expand Down

0 comments on commit 7e178b9

Please sign in to comment.