Skip to content

Commit

Permalink
Reorganize book parts
Browse files Browse the repository at this point in the history
  • Loading branch information
jennybc committed Oct 3, 2018
1 parent 46f532c commit fad5d1a
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 18 deletions.
2 changes: 0 additions & 2 deletions 30_workflow-first-use-rmd-and-github.Rmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# (PART) Workflows {-}

# Test drive R Markdown {#rmd-test-drive}

We will author an R Markdown document and render it to HTML. We discuss how to keep the intermediate Markdown file, the figures, and what to commit to Git and push to GitHub. If GitHub is the primary venue, we render directly to GitHub-flavored markdown and never create HTML.
Expand Down
2 changes: 2 additions & 0 deletions 37_workflow-git-commands.Rmd → 33_git-commands.Rmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# (PART) Git basics {-}

# 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.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,12 @@ They love that!

You can create a link that takes people directly to an editing interface in the browser. Behind the scenes, assuming the click-er is signed into GitHub but is not you, this will create a fork in their account and send you a pull request. When I click the link below, I am able to actually commit directly to `master` for this repo.

[CLICK HERE to suggest an edit to this page!](https://github.com/jennybc/happy-git-with-r/edit/master/32_workflow-make-github-repo-browsable.Rmd)
[CLICK HERE to suggest an edit to this page!](https://github.com/jennybc/happy-git-with-r/edit/master/60_workflow-make-github-repo-browsable.Rmd)

Here's what that link looks like in the Markdown source:

```
[CLICK HERE to suggest an edit to this page!](https://github.com/jennybc/happy-git-with-r/edit/master/32_workflow-make-github-repo-browsable.Rmd)
[CLICK HERE to suggest an edit to this page!](https://github.com/jennybc/happy-git-with-r/edit/master/60_workflow-make-github-repo-browsable.Rmd)
```

and here it is with placeholders:
Expand Down
31 changes: 17 additions & 14 deletions _bookdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,25 @@ rmd_files: [
"20_usage-new-project-github-first.Rmd",
"21_usage-existing-project-github-first.Rmd",
"22_usage-existing-project-github-last.Rmd",

"30_workflow-first-use-rmd-and-github.Rmd",
"31_workflow-first-use-r-script-and-github.Rmd",
"32_workflow-make-github-repo-browsable.Rmd",
"36_workflow-explore-extend-pull-request.Rmd",
"37_workflow-git-commands.Rmd",
"38_workflow-git-branches.Rmd",
"39_workflow-git-remotes.Rmd",

"40_prompt-clone.Rmd",
"41_prompt-fork.Rmd",
"42_prompt-fork-pr-bingo.Rmd",
"43_prompt-burn-it-all-down.Rmd",
"44_prompt-practice-resets.Rmd",
"46_prompt-pull.Rmd",
"47_prompt-search-github.Rmd",

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

"40_workflow-pull.Rmd",
"49_workflow-explore-extend-pull-request.Rmd",

"50_prompt-clone.Rmd",
"51_prompt-fork.Rmd",
"52_prompt-fork-pr-bingo.Rmd",
"53_prompt-burn-it-all-down.Rmd",
"54_prompt-practice-resets.Rmd",
"57_prompt-search-github.Rmd",

"60_article-make-github-repo-browsable.Rmd",

"60_classroom-overview.Rmd",

Expand Down

0 comments on commit fad5d1a

Please sign in to comment.