diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..455da49 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Pat Schloss + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..8b85e91 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# README + +This is an RStudio-based version of the materials developed by @frfeng and his [intro-git](https://github.com/frfeng/intro-git) teaching notes diff --git a/images/dropbox.png b/images/dropbox.png new file mode 100644 index 0000000..da8fdb9 Binary files /dev/null and b/images/dropbox.png differ diff --git a/images/excel-undo.png b/images/excel-undo.png new file mode 100644 index 0000000..c2d43d5 Binary files /dev/null and b/images/excel-undo.png differ diff --git a/images/github-collaborators-add.png b/images/github-collaborators-add.png new file mode 100644 index 0000000..d1909ee Binary files /dev/null and b/images/github-collaborators-add.png differ diff --git a/images/github-collaborators-waiting.png b/images/github-collaborators-waiting.png new file mode 100644 index 0000000..ccf53d5 Binary files /dev/null and b/images/github-collaborators-waiting.png differ diff --git a/images/github-collaborators.png b/images/github-collaborators.png new file mode 100644 index 0000000..33d8148 Binary files /dev/null and b/images/github-collaborators.png differ diff --git a/images/github-commit-diff.png b/images/github-commit-diff.png new file mode 100644 index 0000000..7191f47 Binary files /dev/null and b/images/github-commit-diff.png differ diff --git a/images/github-commit-history.png b/images/github-commit-history.png new file mode 100644 index 0000000..14f26c5 Binary files /dev/null and b/images/github-commit-history.png differ diff --git a/images/github-create-new-file.png b/images/github-create-new-file.png new file mode 100644 index 0000000..210d2c5 Binary files /dev/null and b/images/github-create-new-file.png differ diff --git a/images/github-dropdown-developer-settings.png b/images/github-dropdown-developer-settings.png new file mode 100644 index 0000000..50d2bf4 Binary files /dev/null and b/images/github-dropdown-developer-settings.png differ diff --git a/images/github-dropdown-pat-settings.png b/images/github-dropdown-pat-settings.png new file mode 100644 index 0000000..ba2768d Binary files /dev/null and b/images/github-dropdown-pat-settings.png differ diff --git a/images/github-dropdown-settings.png b/images/github-dropdown-settings.png new file mode 100644 index 0000000..7daa913 Binary files /dev/null and b/images/github-dropdown-settings.png differ diff --git a/images/github-generate-pat.png b/images/github-generate-pat.png new file mode 100644 index 0000000..a50b319 Binary files /dev/null and b/images/github-generate-pat.png differ diff --git a/images/github-ignore-warning.png b/images/github-ignore-warning.png new file mode 100644 index 0000000..99a7b7a Binary files /dev/null and b/images/github-ignore-warning.png differ diff --git a/images/github-license-commit.png b/images/github-license-commit.png new file mode 100644 index 0000000..571e488 Binary files /dev/null and b/images/github-license-commit.png differ diff --git a/images/github-license-text.png b/images/github-license-text.png new file mode 100644 index 0000000..2beebf8 Binary files /dev/null and b/images/github-license-text.png differ diff --git a/images/github-name-file-license.png b/images/github-name-file-license.png new file mode 100644 index 0000000..fbeb90a Binary files /dev/null and b/images/github-name-file-license.png differ diff --git a/images/github-new-access-token-1.png b/images/github-new-access-token-1.png new file mode 100644 index 0000000..6f9bf6e Binary files /dev/null and b/images/github-new-access-token-1.png differ diff --git a/images/github-new-access-token-2.png b/images/github-new-access-token-2.png new file mode 100644 index 0000000..dedb7ae Binary files /dev/null and b/images/github-new-access-token-2.png differ diff --git a/images/github-push-instructions.png b/images/github-push-instructions.png new file mode 100644 index 0000000..e4e11a8 Binary files /dev/null and b/images/github-push-instructions.png differ diff --git a/images/github-readme-push.png b/images/github-readme-push.png new file mode 100644 index 0000000..c6fb06f Binary files /dev/null and b/images/github-readme-push.png differ diff --git a/images/github-repo-update.png b/images/github-repo-update.png new file mode 100644 index 0000000..ecc4ac3 Binary files /dev/null and b/images/github-repo-update.png differ diff --git a/images/github-select-license.png b/images/github-select-license.png new file mode 100644 index 0000000..1c1100a Binary files /dev/null and b/images/github-select-license.png differ diff --git a/images/google-docs.png b/images/google-docs.png new file mode 100644 index 0000000..fa4d130 Binary files /dev/null and b/images/google-docs.png differ diff --git a/images/googlesheets-diff.png b/images/googlesheets-diff.png new file mode 100644 index 0000000..9d0ea15 Binary files /dev/null and b/images/googlesheets-diff.png differ diff --git a/images/rstudio-git-commit-success.png b/images/rstudio-git-commit-success.png new file mode 100644 index 0000000..e881bef Binary files /dev/null and b/images/rstudio-git-commit-success.png differ diff --git a/images/rstudio-git-commit.png b/images/rstudio-git-commit.png new file mode 100644 index 0000000..12ef577 Binary files /dev/null and b/images/rstudio-git-commit.png differ diff --git a/images/rstudio-git-history.png b/images/rstudio-git-history.png new file mode 100644 index 0000000..4c888a3 Binary files /dev/null and b/images/rstudio-git-history.png differ diff --git a/images/rstudio-git-init-1.png b/images/rstudio-git-init-1.png new file mode 100644 index 0000000..f612e83 Binary files /dev/null and b/images/rstudio-git-init-1.png differ diff --git a/images/rstudio-git-init-2.png b/images/rstudio-git-init-2.png new file mode 100644 index 0000000..4dffa14 Binary files /dev/null and b/images/rstudio-git-init-2.png differ diff --git a/images/rstudio-git-push-setup-w-pat.png b/images/rstudio-git-push-setup-w-pat.png new file mode 100644 index 0000000..040aef0 Binary files /dev/null and b/images/rstudio-git-push-setup-w-pat.png differ diff --git a/images/rstudio-git-push-setup.png b/images/rstudio-git-push-setup.png new file mode 100644 index 0000000..6b92240 Binary files /dev/null and b/images/rstudio-git-push-setup.png differ diff --git a/images/rstudio-git-staged.png b/images/rstudio-git-staged.png new file mode 100644 index 0000000..28d06c0 Binary files /dev/null and b/images/rstudio-git-staged.png differ diff --git a/images/rstudio-git-unstaged.png b/images/rstudio-git-unstaged.png new file mode 100644 index 0000000..f5e1b62 Binary files /dev/null and b/images/rstudio-git-unstaged.png differ diff --git a/images/rstudio-new-markdown.png b/images/rstudio-new-markdown.png new file mode 100644 index 0000000..8d86667 Binary files /dev/null and b/images/rstudio-new-markdown.png differ diff --git a/images/rstudio-new-terminal.png b/images/rstudio-new-terminal.png new file mode 100644 index 0000000..ece70c6 Binary files /dev/null and b/images/rstudio-new-terminal.png differ diff --git a/images/rstudio-post-pull.png b/images/rstudio-post-pull.png new file mode 100644 index 0000000..66b68e9 Binary files /dev/null and b/images/rstudio-post-pull.png differ diff --git a/images/rstudio-pre-pull.png b/images/rstudio-pre-pull.png new file mode 100644 index 0000000..d03f6fe Binary files /dev/null and b/images/rstudio-pre-pull.png differ diff --git a/images/rstudio-readme-commit-1.png b/images/rstudio-readme-commit-1.png new file mode 100644 index 0000000..b24e86a Binary files /dev/null and b/images/rstudio-readme-commit-1.png differ diff --git a/images/rstudio-readme-commit-2.png b/images/rstudio-readme-commit-2.png new file mode 100644 index 0000000..4bceb42 Binary files /dev/null and b/images/rstudio-readme-commit-2.png differ diff --git a/images/rstudio-readme-diff.png b/images/rstudio-readme-diff.png new file mode 100644 index 0000000..6c0fbc8 Binary files /dev/null and b/images/rstudio-readme-diff.png differ diff --git a/images/rstudio-readme-edit.png b/images/rstudio-readme-edit.png new file mode 100644 index 0000000..91a4c75 Binary files /dev/null and b/images/rstudio-readme-edit.png differ diff --git a/images/rstudio-readme-paragraph-commit.png b/images/rstudio-readme-paragraph-commit.png new file mode 100644 index 0000000..8c7770d Binary files /dev/null and b/images/rstudio-readme-paragraph-commit.png differ diff --git a/images/rstudio-readme-push.png b/images/rstudio-readme-push.png new file mode 100644 index 0000000..ba1b1ea Binary files /dev/null and b/images/rstudio-readme-push.png differ diff --git a/images/rstudio-readme-stage-modify.png b/images/rstudio-readme-stage-modify.png new file mode 100644 index 0000000..9fb3a0d Binary files /dev/null and b/images/rstudio-readme-stage-modify.png differ diff --git a/images/rstudio-readme-unstaged.png b/images/rstudio-readme-unstaged.png new file mode 100644 index 0000000..b5a679c Binary files /dev/null and b/images/rstudio-readme-unstaged.png differ diff --git a/images/rstudio-terminal.png b/images/rstudio-terminal.png new file mode 100644 index 0000000..1076dd3 Binary files /dev/null and b/images/rstudio-terminal.png differ diff --git a/images/starting-directory-structure.png b/images/starting-directory-structure.png new file mode 100644 index 0000000..caec71b Binary files /dev/null and b/images/starting-directory-structure.png differ diff --git a/images/word-diff.png b/images/word-diff.png new file mode 100644 index 0000000..31497f1 Binary files /dev/null and b/images/word-diff.png differ diff --git a/index.html b/index.html index 02ea60b..8ec1623 100644 --- a/index.html +++ b/index.html @@ -27,21 +27,56 @@