From 4a570d80f90b6d87b21ac64fe6120d6a2e547db7 Mon Sep 17 00:00:00 2001 From: Jenny Bryan Date: Mon, 7 Jan 2019 17:58:54 -0800 Subject: [PATCH] Stop numbering my files, Act Two; add connect intro --- _bookdown.yml | 13 +++++++------ ...use-git.Rmd => connect-can-rstudio-use-git.Rmd | 0 ...-caching.Rmd => connect-credential-caching.Rmd | 0 ...nnect-git-github.Rmd => connect-git-github.Rmd | 2 -- connect-intro.Rmd | 15 +++++++++++++++ ...t-github.Rmd => connect-rstudio-git-github.Rmd | 0 12_connect-ssh-keys.Rmd => connect-ssh-keys.Rmd | 0 ...bleshooting.Rmd => connect-troubleshooting.Rmd | 0 8 files changed, 22 insertions(+), 8 deletions(-) rename 14_connect-can-rstudio-use-git.Rmd => connect-can-rstudio-use-git.Rmd (100%) rename 11_connect-credential-caching.Rmd => connect-credential-caching.Rmd (100%) rename 10_connect-git-github.Rmd => connect-git-github.Rmd (99%) create mode 100644 connect-intro.Rmd rename 13_connect-rstudio-git-github.Rmd => connect-rstudio-git-github.Rmd (100%) rename 12_connect-ssh-keys.Rmd => connect-ssh-keys.Rmd (100%) rename 15_install-connect-troubleshooting.Rmd => connect-troubleshooting.Rmd (100%) diff --git a/_bookdown.yml b/_bookdown.yml index 7552549d..3e0eb480 100644 --- a/_bookdown.yml +++ b/_bookdown.yml @@ -19,12 +19,13 @@ rmd_files: [ "install-introduce-self-git.Rmd", "install-git-client.Rmd", - "10_connect-git-github.Rmd", - "11_connect-credential-caching.Rmd", - "12_connect-ssh-keys.Rmd", - "13_connect-rstudio-git-github.Rmd", - "14_connect-can-rstudio-use-git.Rmd", - "15_install-connect-troubleshooting.Rmd", + "connect-intro.Rmd", + "connect-git-github.Rmd", + "connect-credential-caching.Rmd", + "connect-ssh-keys.Rmd", + "connect-rstudio-git-github.Rmd", + "connect-can-rstudio-use-git.Rmd", + "connect-troubleshooting.Rmd", "20_usage-new-project-github-first.Rmd", "21_usage-existing-project-github-first.Rmd", diff --git a/14_connect-can-rstudio-use-git.Rmd b/connect-can-rstudio-use-git.Rmd similarity index 100% rename from 14_connect-can-rstudio-use-git.Rmd rename to connect-can-rstudio-use-git.Rmd diff --git a/11_connect-credential-caching.Rmd b/connect-credential-caching.Rmd similarity index 100% rename from 11_connect-credential-caching.Rmd rename to connect-credential-caching.Rmd diff --git a/10_connect-git-github.Rmd b/connect-git-github.Rmd similarity index 99% rename from 10_connect-git-github.Rmd rename to connect-git-github.Rmd index d92a8257..6105d463 100644 --- a/10_connect-git-github.Rmd +++ b/connect-git-github.Rmd @@ -1,5 +1,3 @@ -# (PART) Connect Git, GitHub, RStudio {-} - # Connect to GitHub {#push-pull-github} Objective: make sure that you can pull from and push to GitHub from your computer. diff --git a/connect-intro.Rmd b/connect-intro.Rmd new file mode 100644 index 00000000..4cd3435e --- /dev/null +++ b/connect-intro.Rmd @@ -0,0 +1,15 @@ +# (PART) Connect Git, GitHub, RStudio {-} + +# Can you hear me now? {#connect-intro .unnumbered} + +The next few chapters walk through some basic operations to confirm you have installed the necessary software and that the necessary connections are being made, between tools on your computer and between your computer and GitHub. + +This has a lot of overlap with some basic workflows we revisit later, but the second time around (or in a live workshop), we'll spend more time explaining what's happening and why. + +In [Connect to GitHub] we use Git in the shell to make sure you can clone a repo from GitHub and establish two-way communications. + +In [Cache credentials for HTTPS] and [Set up keys for SSH] we present two approaches for persistently authenticating yourself with GitHub, so you don't need to provide credentials *ad nauseum*. + +In [Connect RStudio to Git and GitHub] we confirm that RStudio can work with your Git installation to perform local operations and communicate with GitHub. + +Hopefully you won't need it, but this part concludes with two troubleshooting chapters: [Detect Git from RStudio] and [RStudio, Git, GitHub Hell]. diff --git a/13_connect-rstudio-git-github.Rmd b/connect-rstudio-git-github.Rmd similarity index 100% rename from 13_connect-rstudio-git-github.Rmd rename to connect-rstudio-git-github.Rmd diff --git a/12_connect-ssh-keys.Rmd b/connect-ssh-keys.Rmd similarity index 100% rename from 12_connect-ssh-keys.Rmd rename to connect-ssh-keys.Rmd diff --git a/15_install-connect-troubleshooting.Rmd b/connect-troubleshooting.Rmd similarity index 100% rename from 15_install-connect-troubleshooting.Rmd rename to connect-troubleshooting.Rmd