From 85cd2de57ff18be9241272572ec396ece785cd68 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Tue, 30 Dec 2014 14:23:29 -0700 Subject: [PATCH] Remove deprecated chapter-aggregation pages --- slides/git-for-education-from-svn.html | 56 ------ slides/git-for-publishing.html | 29 ---- slides/git-foundations-impress.html | 230 ------------------------- slides/github-advanced.md | 30 ---- slides/github-api.html | 8 - slides/github-diagramsonly.md | 31 ---- slides/github-first-look.html | 28 --- slides/github-for-non-programmers.html | 24 --- slides/github-foundations.md | 20 --- slides/github-intermediate.md | 21 --- slides/github-pages.md | 18 -- slides/github-tour.html | 14 -- 12 files changed, 509 deletions(-) delete mode 100644 slides/git-for-education-from-svn.html delete mode 100644 slides/git-for-publishing.html delete mode 100644 slides/git-foundations-impress.html delete mode 100644 slides/github-advanced.md delete mode 100644 slides/github-api.html delete mode 100644 slides/github-diagramsonly.md delete mode 100644 slides/github-first-look.html delete mode 100644 slides/github-for-non-programmers.html delete mode 100644 slides/github-foundations.md delete mode 100644 slides/github-intermediate.md delete mode 100644 slides/github-pages.md delete mode 100644 slides/github-tour.html diff --git a/slides/git-for-education-from-svn.html b/slides/git-for-education-from-svn.html deleted file mode 100644 index 73e73f1d2..000000000 --- a/slides/git-for-education-from-svn.html +++ /dev/null @@ -1,56 +0,0 @@ ---- -theme: github -layout: slide -deck_type: revealjs -title: GitHub Education Foundations -chapters: [ - 'preroll', - 'intro', - 'git', - 'setup', - 'init', - 'config', - 'commit', - 'diff', - 'log', - 'branch', - 'merge', - 'github/intro', - 'github/pull-request', - 'reset', - 'goodbye'] -categories: ['presentations'] ---- - -# Git For Education -Learning Git in your CS program can be hard, and sometimes you come from SVN! - -This should help. - -* Getting started - * what is DVCS - * how are changes stored - * Data structure of git - * Hashing - * 90% of work done without internet connection - * Only sharing when you decide to (push/pull/fetch, etc) -* Init - * .git/ at top level - * watches everything below it. - * don't need to ensure "checkins" are done at different folders - * git config -* 3 stage thinking - * Shopping Cart - * Bi-directional - * `git status` helps you put things in, and take things out - * Add - * Commit -* Log/diff ( Optional ) - * Do a pull on the git project live - * `git log -S ` - * `git log -g ` - * `git log --author=peff` -* BRANCHES. ALL THE TIME. -* Fast merges (heavy "read more after" material) for experiments. -* Push/Pull - * could try to avoid showing "out of date from origin/master by n-commits" diff --git a/slides/git-for-publishing.html b/slides/git-for-publishing.html deleted file mode 100644 index dd0e677a3..000000000 --- a/slides/git-for-publishing.html +++ /dev/null @@ -1,29 +0,0 @@ ---- -theme: github -layout: slide -deck_type: revealjs -title: GitHub and Git for Publishing -chapters: [ - 'preroll', - 'trainers/tim-berglund', - 'trainers/matthew-mccullough', - 'intro', - 'git', - 'setup', - 'config', - 'github/intro', - 'init', - 'git/repository', - 'commit', - 'diff', - 'log', - 'branch', - 'merge', - 'rebase', - 'network', - 'github/intro', - 'github/forking', - 'github/pull-request', - 'goodbye'] -categories: ['presentations'] ---- diff --git a/slides/git-foundations-impress.html b/slides/git-foundations-impress.html deleted file mode 100644 index aff3e70c8..000000000 --- a/slides/git-foundations-impress.html +++ /dev/null @@ -1,230 +0,0 @@ ---- -theme: github -layout: slide -deck_type: impressjs -title: GitHub Foundations -chapters: [ - 'preroll', - 'intro', - 'git', - 'setup', - 'config', - 'init', - 'commit', - 'diff', - 'log', - 'rm-mv', - 'ignore', - 'checkout', - 'branch', - 'merge', - 'rebase', - 'network', - 'github/intro', - 'github/forking', - 'github/pull-request', - 'reset', - 'gui', - 'reflog', - 'goodbye'] -categories: ['presentations'] ---- - -# Git Foundations - - -# Getting Started -## Intro -* Git: version control system -* GitHub: store code, share code - -## Preparation -* Installing git -* Verifying & checking version - * `git --version` - -## config -* 3 tiers of config - * `--global` - * `--system` - * `--local (default)` -* `git config --list` -* `git config user.name` -* `git config user.email` -* `git config --global core.autocrlf ` - - -## commit -* `git status` - * Reviewing help on status output -* `git add ` -* `git commit` or `git commit -m""` - - -## diff -* `git diff` - * Working copy to staging -* `git diff --staged` - * Staged to commit -* `git diff HEAD` - * Working copy to commit - -### Decorating diffs - * `git diff --color-words` - * `git diff --word-diff` - -## log -* `log` - * commit history -* `git log -` -* `git log --author=` - * Querying for patch author -* `git log -S=` - * Search for string match _in_ patch -* `git log --stat` - * Listing files of patch -* `git log --patch` - * Listing patch change sets -* `git log --word-diff --patch` -* `git log --graph` - -## rm -* Git interacting with filesystem -* Removes (deletes!) the file, stages deletion - * `git rm ` - -* Un-tracking tracked files - * `git rm --cached -- ` - -## mv -* Moving generates new tree, not a new blob - * Hash will be different - * `git mv ` - -### Similarity Index -* Noting "100%" on commit output? - * `git log --stat -M` - * `git log --follow ` - -## ignore -* Creating a .gitignore -* Adding patterns -* Global/external ignore - * `git config --global core.excludesfile` - - -## branch -* Creating feature or prototype -* Showing local branches - * `git branch` -* Showing remote branches - * `git branch -r` -* Showing all branches - * `git branch -a` -* Creating a branch - * `git branch ` -* Deleting a branch - * `git branch -d ` -* Show all branches sorted by the ones that were most recently changed. - * `git for-each-ref --sort=committerdate refs/heads/ --format="%(committerdate) %09 %(committerdate:relative) %09 %(refname:short)"` - -## merge -* Folding in branches - * `git merge` or `git merge -m` -* Conflicting merges - * Resolving file - * `git add ` - * `git rebase --continue` - - -## rebase -### branch preparation -* Explaining fast-forward -* Rebasing __is not__ merging! - * `git checkout ` - * `git rebase master` - -### interactive -* `git rebase -i ` - -## reflog -* Tracing Git action "history" - -## reset -* Losing data with Git is difficult (but possible) -* Clearing index and working directory - * `git reset --hard` -* Reseting index, updating working directory - * `git reset --mixed` -* Reseting index only - * `git reset --soft` - -## revert -* Generating commit to restore past patch set - * `git revert ` - -# GitHub - -## Basic Interaction -* Creating an account -* Reviewing UI -* Deciding on protocol - * https - * ssh -* Creating a new _repo_ - - -## Repo Retrieval -* Using `git clone` -* Understanding remotes - -## Network -* `git remote add origin ` -* show how `origin` will be setup - -## remote -* Aliasing to server paths - * `git remote add ` -* Removing connections - * `git remote -d ` - -## push -* Publishing commit history - * `git push -u origin master` - -## pull -* Automatically fold-in/merge remote's commits - * `git pull origin` - -## fetch -* Comparing without merging -* Merging selectively -* Rebasing with respect to published - * `git fetch ` - * `FETCH_HEAD` - -## Pull Request -* Pushing branch to repo -* Creating GH pull request - -### Automatic Merge -* Using GH Interface - -### Manual Merge -* Using `FETCH_HEAD` approach -* Using GitHub tip approach - - -# Bonus Material - -## stash -* `git stash` -* `git stash list` -* `git stash pop ` -* `git stash drop ` -* `git stash apply` - -## tag -* `git tag -m ` -* `git tag -a -m ` -* `git tag` diff --git a/slides/github-advanced.md b/slides/github-advanced.md deleted file mode 100644 index b1c9afb93..000000000 --- a/slides/github-advanced.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -layout: slide -deck_type: revealjs -theme: github -title: GitHub Advanced Course Slides -deck_title: Advanced Class -description: A slide deck to the GitHub Advanced class. -chapters: -- mastering-shortcuts -- isolating-work -- understanding-git -- best-practices -- ignore -- navigating-history -- temporary-changes -- incorporating-history -- rewriting-history -- reordering-history -- fixing-branches -- cutting-releases -- reviewing-synchronizing -- customizing-interaction -- maintaining-remotes -- aggregating-dependencies -- incorporating-dependencies -- github-cli -- signing-work -- cleaning-up -- avoiding-repetitive-conflicts ---- diff --git a/slides/github-api.html b/slides/github-api.html deleted file mode 100644 index bb45d093a..000000000 --- a/slides/github-api.html +++ /dev/null @@ -1,8 +0,0 @@ ---- -theme: github -layout: slide -deck_type: revealjs -title: GitHub API Foundations -chapters: ['intro', 'api', 'goodbye'] -categories: ['presentations'] ---- diff --git a/slides/github-diagramsonly.md b/slides/github-diagramsonly.md deleted file mode 100644 index 00fca9a76..000000000 --- a/slides/github-diagramsonly.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -layout: slide -deck_type: revealjs-diagrams-only -theme: github -title: GitHub Diagram Slides -description: A slide deck comprised only of diagrams for the suite of GitHub classes. -chapters: [ - 'preroll', - 'intro', - 'git', - 'setup', - 'config', - 'init', - 'commit', - 'diff', - 'log', - 'rm-mv', - 'ignore', - 'checkout', - 'branch', - 'merge', - 'rebase', - 'network', - 'github/intro', - 'github/forking', - 'github/pull-request', - 'reset', - 'gui', - 'reflog', - 'goodbye'] ---- diff --git a/slides/github-first-look.html b/slides/github-first-look.html deleted file mode 100644 index 6483be6ce..000000000 --- a/slides/github-first-look.html +++ /dev/null @@ -1,28 +0,0 @@ ---- -theme: github -layout: slide -deck_type: revealjs -title: GitHub - A First Look -chapters: [ - 'preroll', - 'trainers/matthew-mccullough', - 'intro', - 'git', - 'setup', - 'init', - 'why-git-vcs', - 'gui', - 'git/repository', - 'commit', - 'diff', - 'log', - 'checkout', - 'branch', - 'merge', - 'network', - 'github/intro', - 'github/forking', - 'github/pull-request', - 'goodbye'] -categories: ['presentations'] ---- diff --git a/slides/github-for-non-programmers.html b/slides/github-for-non-programmers.html deleted file mode 100644 index c9b4dccb0..000000000 --- a/slides/github-for-non-programmers.html +++ /dev/null @@ -1,24 +0,0 @@ ---- -theme: github -layout: slide -deck_type: revealjs -title: GitHub for Non-Programmers -chapters: [ - 'intro-np', - 'resources', - 'github-np', - 'repo-np', - 'commit-np', - 'branch-np', - 'issue-np', - 'pull-request-np', - 'notification-np', - 'organization-np', - 'gist-np', - 'native-np', - 'settings', - 'profile', - 'gh-pages-np' -] -categories: ['presentations'] ---- diff --git a/slides/github-foundations.md b/slides/github-foundations.md deleted file mode 100644 index 2e5c3be95..000000000 --- a/slides/github-foundations.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -layout: slide -deck_type: revealjs -theme: github -title: GitHub Foundations Course Slides -deck_title: Foundations Class -description: A slide deck to the GitHub Foundations class. -chapters: -- git-concepts -- github-concepts -- repository-creation -- web-flow -- local-repository -- history-synchronization -- branches -- merges -- collaboration -- project-management -- github-features ---- diff --git a/slides/github-intermediate.md b/slides/github-intermediate.md deleted file mode 100644 index f36b9a174..000000000 --- a/slides/github-intermediate.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -layout: slide -deck_type: revealjs -theme: github -title: GitHub Foundations Course Slides -deck_title: Intermediate Class -description: A slide deck to the GitHub Foundations class. -chapters: -- setup -- getting-started -- versioning-content -- reviewing-modifications -- reviewing-changes -- local-workflows -- distributed-repositories -- remote-workflows -- utilities-shortcuts -- file-lifecycle -- undoing-changes -- recovering-anything ---- diff --git a/slides/github-pages.md b/slides/github-pages.md deleted file mode 100644 index 4c599f692..000000000 --- a/slides/github-pages.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -theme: github -layout: slide-revealjs -title: GitHub Pages, Jekyll, and You! -chapters: - - "pages/title" - - "pages/overview" - - setup - - "pages/pages" - - "pages/getting-started" - - "pages/jekyll" - - "pages/layouts" - - "pages/template-data" - - "pages/moar-jekyll" - - goodbye -categories: - - presentations ---- diff --git a/slides/github-tour.html b/slides/github-tour.html deleted file mode 100644 index fe40cf4f4..000000000 --- a/slides/github-tour.html +++ /dev/null @@ -1,14 +0,0 @@ ---- -theme: github -layout: slide -deck_type: revealjs -title: GitHub Advanced -chapters: [ - 'github/contributors', - 'github/gh-pages', - 'github/issues', - 'github/organizations', - 'github/pull-requests' - ] -categories: ['presentations'] ----