diff --git a/_layouts/default.html b/_layouts/default.html new file mode 100644 index 000000000..b92f65223 --- /dev/null +++ b/_layouts/default.html @@ -0,0 +1 @@ +{{content}} diff --git a/_layouts/home.html b/_layouts/home.html new file mode 100644 index 000000000..b92f65223 --- /dev/null +++ b/_layouts/home.html @@ -0,0 +1 @@ +{{content}} diff --git a/slides/_posts/advanced/aggregating-dependencies/0001-01-01-submodule.md b/slides/_posts/advanced/aggregating-dependencies/0001-01-01-submodule.md deleted file mode 100644 index 44d36777e..000000000 --- a/slides/_posts/advanced/aggregating-dependencies/0001-01-01-submodule.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -chapter: Aggregating dependencies -layout: slide -title: '' -tags: -- aggregating-dependencies ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -Add a separate repository as a subdirectory - -``` -$ git submodule add [repo-url] [folder] -``` - -For a freshly cloned repository with submodules - -``` -$ git submodule init -$ git submodule update -``` - -or - -``` -$ git submodule update --init --recursive -``` diff --git a/slides/_posts/advanced/avoiding-repetitive-conflicts/0001-01-01-rerere.md b/slides/_posts/advanced/avoiding-repetitive-conflicts/0001-01-01-rerere.md deleted file mode 100644 index 75acfa845..000000000 --- a/slides/_posts/advanced/avoiding-repetitive-conflicts/0001-01-01-rerere.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -chapter: Avoiding repetitive conflicts -layout: slide -title: '' -tags: -- avoiding-repetitive-conflicts ---- - -{% capture notes %} -* *Re*use *re*corded *re*solution -* Preserves pre-image to simplify conflicts -{% endcapture %} -{% include hydeslides/core/notes %} - -``` -$ git config rerere.enable true -``` diff --git a/slides/_posts/advanced/best-practices/0001-01-01-merge-and-branch.md b/slides/_posts/advanced/best-practices/0001-01-01-merge-and-branch.md deleted file mode 100644 index 307987a9e..000000000 --- a/slides/_posts/advanced/best-practices/0001-01-01-merge-and-branch.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -chapter: Best practices -layout: slide -title: '' -tags: -- best-practices ---- - -{% capture notes %} -* Collapsing commits during merge -* Checking merge state -* Cleaning up branches -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git merge --squash [branch] - -$ git branch --contains [commit] - -$ git branch --merged [commit] - -$ git branch --no-merged [commit] -``` diff --git a/slides/_posts/advanced/cleaning-up/0001-01-01-basic-filter-branch.md b/slides/_posts/advanced/cleaning-up/0001-01-01-basic-filter-branch.md deleted file mode 100644 index a2d367c9f..000000000 --- a/slides/_posts/advanced/cleaning-up/0001-01-01-basic-filter-branch.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -chapter: Cleaning up -layout: slide -title: '' -tags: -- cleaning-up ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -``` -$ git filter-branch - --subdirectory-filter [dir] - -- --all -``` - -``` -$ git filter-branch --index-filter - 'git rm --cached - --ignore-unmatch [file]' HEAD -``` diff --git a/slides/_posts/advanced/customizing-interaction/0001-01-01-custom-refspec.md b/slides/_posts/advanced/customizing-interaction/0001-01-01-custom-refspec.md deleted file mode 100644 index c3ba36440..000000000 --- a/slides/_posts/advanced/customizing-interaction/0001-01-01-custom-refspec.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -chapter: Customizing interaction -layout: slide -title: '' -tags: -- customizing-interaction ---- - -{% capture notes %} -* Specification for retrieval and pushing -* Implied on fetch, pull, and push -* Altered by option switches like `--tags` -* Stored in `.git/config` -* Ability to retrieve Pull Request branches -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git fetch [repo-url] [source]:[destination] -$ git config --add remote.[upstream].fetch "+refs/pull/*/head:refs/remotes/[upstream]/pull/*" -``` diff --git a/slides/_posts/advanced/cutting-releases/0001-01-01-annotated.md b/slides/_posts/advanced/cutting-releases/0001-01-01-annotated.md deleted file mode 100644 index b098c4916..000000000 --- a/slides/_posts/advanced/cutting-releases/0001-01-01-annotated.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -chapter: Cutting releases -layout: slide -title: '' -tags: -- cutting-releases ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git tag -a [TAG_NAME] [commit|branch] -$ git tag -a -m [TAG_NAME] [commit|branch] -``` diff --git a/slides/_posts/advanced/cutting-releases/0001-01-01-diagram.md b/slides/_posts/advanced/cutting-releases/0001-01-01-diagram.md deleted file mode 100644 index 90ce62e29..000000000 --- a/slides/_posts/advanced/cutting-releases/0001-01-01-diagram.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Cutting releases -layout: slide -title: '' -tags: -- cutting-releases -diagram_svg_path: "assets/diagrams/tag.svg" ---- diff --git a/slides/_posts/advanced/cutting-releases/0001-01-01-lightweight.md b/slides/_posts/advanced/cutting-releases/0001-01-01-lightweight.md deleted file mode 100644 index c37e5c39a..000000000 --- a/slides/_posts/advanced/cutting-releases/0001-01-01-lightweight.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: Cutting releases -layout: slide -title: '' -tags: -- cutting-releases ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git tag [TAGNAME] [commit] -``` diff --git a/slides/_posts/advanced/cutting-releases/0001-01-01-options.md b/slides/_posts/advanced/cutting-releases/0001-01-01-options.md deleted file mode 100644 index f3cd722d3..000000000 --- a/slides/_posts/advanced/cutting-releases/0001-01-01-options.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -chapter: Cutting releases -layout: slide -title: '' -tags: -- cutting-releases ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git tag -s -m[message] [TAGNAME] -$ git tag -f [TAGNAME] -$ git tag -d [TAGNAME] -$ git describe -$ git describe [SHA] -$ git tag -d 12345 -$ git push origin :[tag-name-to-delete] -``` diff --git a/slides/_posts/advanced/fixing-branches/0001-01-01-moving-branch-base.md b/slides/_posts/advanced/fixing-branches/0001-01-01-moving-branch-base.md deleted file mode 100644 index d691749c9..000000000 --- a/slides/_posts/advanced/fixing-branches/0001-01-01-moving-branch-base.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -chapter: Fixing branches -layout: slide -title: '' -tags: -- fixing-branches ---- - -{% capture notes %} -* [Rebasing chapter of Pro Git book](http://git-scm.com/book/ch3-6.html) -* [Git rebase --onto section of Pro Git book](http://git-scm.com/book/ch3-6.html#More-Interesting-Rebases) -* Changing where branch history begins -* Moving blocks of history around -* Breadcrumbs for later fixups and squashes -{% endcapture %} -{% include hydeslides/core/notes %} - -Change which base a branch belongs to - -```bash -$ git rebase --onto -``` diff --git a/slides/_posts/advanced/github-cli/0001-01-01-hub-and-gh.md b/slides/_posts/advanced/github-cli/0001-01-01-hub-and-gh.md deleted file mode 100644 index f08f7c268..000000000 --- a/slides/_posts/advanced/github-cli/0001-01-01-hub-and-gh.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -chapter: GitHub CLI -layout: slide -title: '' -tags: -- github-cli ---- - -{% capture notes %} -* API for interfacing with your repos -* Where config/credentials are stored -* Reasons for usage -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ gh create -$ gh pull-request -$ gh fork -$ gh compare -$ gh browse -``` diff --git a/slides/_posts/advanced/ignore/0001-01-01-repository-specific-ignores.md b/slides/_posts/advanced/ignore/0001-01-01-repository-specific-ignores.md deleted file mode 100644 index f3df694e6..000000000 --- a/slides/_posts/advanced/ignore/0001-01-01-repository-specific-ignores.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Ignore -layout: slide -title: '' -tags: -- ignore ---- - -{% capture notes %} -* Ignoring files from repo & system level -* Reviewing ignored files with custom command -* Forcing a staging of ignored files -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ vi .gitignore -``` diff --git a/slides/_posts/advanced/ignore/0002-01-01-system-wide-ignore.md b/slides/_posts/advanced/ignore/0002-01-01-system-wide-ignore.md deleted file mode 100644 index 29feb3c7a..000000000 --- a/slides/_posts/advanced/ignore/0002-01-01-system-wide-ignore.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: Ignore -layout: slide -title: '' -tags: -- ignore ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git config core.excludesfile [path] -``` diff --git a/slides/_posts/advanced/ignore/0003-01-01-listing-ignored-files.md b/slides/_posts/advanced/ignore/0003-01-01-listing-ignored-files.md deleted file mode 100644 index 637812010..000000000 --- a/slides/_posts/advanced/ignore/0003-01-01-listing-ignored-files.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Ignore -layout: slide -title: '' -tags: -- ignore ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git config alias.show-ignored - "ls-files --exclude-standard - --others --ignored" -``` diff --git a/slides/_posts/advanced/ignore/0004-01-01-staging-ignored-files.md b/slides/_posts/advanced/ignore/0004-01-01-staging-ignored-files.md deleted file mode 100644 index 8cb64161d..000000000 --- a/slides/_posts/advanced/ignore/0004-01-01-staging-ignored-files.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: Ignore -layout: slide -title: '' -tags: -- ignore ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git add -f [path] -``` diff --git a/slides/_posts/advanced/incorporating-dependencies/0001-01-01-secondary-remote.md b/slides/_posts/advanced/incorporating-dependencies/0001-01-01-secondary-remote.md deleted file mode 100644 index 0356cdaa6..000000000 --- a/slides/_posts/advanced/incorporating-dependencies/0001-01-01-secondary-remote.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -chapter: Incorporating dependencies -layout: slide -title: '' -tags: -- incorporating-dependencies ---- - -{% capture notes %} -* Alternative to submodule -* All files available advantage -{% endcapture %} -{% include hydeslides/core/notes %} - -First a remote connecting to the dependency and a branch in which to read from is needed. - -``` -$ git remote add - [dependency-bookmark] - [repository-url] - -$ git fetch [dependency-bookmark] - -$ git branch [branch] - [dependency-bookmark]/[branch] -``` diff --git a/slides/_posts/advanced/incorporating-dependencies/0002-01-01-read-tree.md b/slides/_posts/advanced/incorporating-dependencies/0002-01-01-read-tree.md deleted file mode 100644 index c515ddcd4..000000000 --- a/slides/_posts/advanced/incorporating-dependencies/0002-01-01-read-tree.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -chapter: Incorporating dependencies -layout: slide -title: '' -tags: -- incorporating-dependencies ---- - -{% capture notes %} -* Notice the working tree content differs between the dependency and the main project. -* Establishing the association of a subdirectory and the branch is necessary when creating the association. -* Whenever the branch needs updating, switch to it, retrieve the changes and commit them against the main project branch(es). -{% endcapture %} -{% include hydeslides/core/notes %} - - -``` -$ git read-tree - --prefix=[directory]/ - -u [branch] -``` - -``` -$ git merge --squash - -s subtree [branch] -``` diff --git a/slides/_posts/advanced/incorporating-history/0001-01-01-cherry-pick.md b/slides/_posts/advanced/incorporating-history/0001-01-01-cherry-pick.md deleted file mode 100644 index fd0f1e2b9..000000000 --- a/slides/_posts/advanced/incorporating-history/0001-01-01-cherry-pick.md +++ /dev/null @@ -1,29 +0,0 @@ ---- -chapter: Incorporating history -layout: slide -title: '' -tags: -- incorporating-history ---- - -{% capture notes %} -* Reusing small pieces of code with `cherry-pick` - * Why use `cherry-pick` instead of `merge`? - * What happens when you `cherry-pick`? - * Maintaining `author` and `committer` fields - * Tracing any cherry-picks with `-x` commit message metadata - * `-x` metadata hyperlinked on GitHub - * `$ git cherry` to view absent commits -* Rebase interactive - * Can include cherry-pick - * Must remember to continue the rebase - * Alters history -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -# Generate new commit on current branch -# with patch of specified commit - -$ git cherry-pick [commit] -``` diff --git a/slides/_posts/advanced/incorporating-history/0002-01-01-cherry.md b/slides/_posts/advanced/incorporating-history/0002-01-01-cherry.md deleted file mode 100644 index b6761423a..000000000 --- a/slides/_posts/advanced/incorporating-history/0002-01-01-cherry.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Incorporating history -layout: slide -title: '' -tags: -- incorporating-history ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -# List branches containing same patch - -$ git cherry [comparison-branch] -``` diff --git a/slides/_posts/advanced/isolating-work/0001-01-01-stage-patches.md b/slides/_posts/advanced/isolating-work/0001-01-01-stage-patches.md deleted file mode 100644 index 1aca72acb..000000000 --- a/slides/_posts/advanced/isolating-work/0001-01-01-stage-patches.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -chapter: Isolating work -layout: slide -title: '' -tags: -- isolating-work ---- - -{% capture notes %} -* Version patches of large change sets -* Stage interactively on command line -* Revise to-be-committed patch -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -# Stage by patch -$ git add -p [file] -``` diff --git a/slides/_posts/advanced/isolating-work/0002-01-01-unstage-patches.md b/slides/_posts/advanced/isolating-work/0002-01-01-unstage-patches.md deleted file mode 100644 index 1a1398aa9..000000000 --- a/slides/_posts/advanced/isolating-work/0002-01-01-unstage-patches.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -chapter: Isolating work -layout: slide -title: '' -tags: -- isolating-work ---- - -{% capture notes %} -* Version patches of large change sets -* Stage interactively on command line -* Revise to-be-committed patch -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -# Unstage by patch -$ git reset -p [file] -``` diff --git a/slides/_posts/advanced/maintaining-remotes/0001-01-01-cleaning-remotes.md b/slides/_posts/advanced/maintaining-remotes/0001-01-01-cleaning-remotes.md deleted file mode 100644 index 2f5b96ed5..000000000 --- a/slides/_posts/advanced/maintaining-remotes/0001-01-01-cleaning-remotes.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -chapter: Maintaining remotes & upstreams -layout: slide -title: '' -tags: -- maintaining-remotes ---- - -{% capture notes %} -* Remove non-matching _local_ remote branches -* Remove non-matching remote upstream branches -* Remove only remote upstream branch -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -# Discard remote local branches -# not present on upstream -$ git fetch --prune - -# Delete an upstream branch -$ git push origin : -``` diff --git a/slides/_posts/advanced/mastering-shortcuts/0001-01-01-versioning-shortcuts.md b/slides/_posts/advanced/mastering-shortcuts/0001-01-01-versioning-shortcuts.md deleted file mode 100644 index 36e169c78..000000000 --- a/slides/_posts/advanced/mastering-shortcuts/0001-01-01-versioning-shortcuts.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -chapter: Mastering shortcuts -layout: slide -title: '' -tags: -- mastering-shortcuts ---- - -{% capture notes %} -* Shortcuts to multiple steps -* Useful customized commands -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git commit -a -m"[message]" - -$ git commit --amend -m "[updated message]" - -$ git checkout -b [branch] [base] -``` diff --git a/slides/_posts/advanced/navigating-history/0001-01-01-exploring-log-options.md b/slides/_posts/advanced/navigating-history/0001-01-01-exploring-log-options.md deleted file mode 100644 index 615df7bcc..000000000 --- a/slides/_posts/advanced/navigating-history/0001-01-01-exploring-log-options.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -chapter: Navigating history -layout: slide -title: '' -tags: -- navigating-history ---- - -```bash -$ git log --author [author-name] - -$ git log --since [integer].days.ago - -$ git log -S [string-in-patch] - -$ git log -G [regex-pattern-in-patch] - -$ git log --grep=[regex-in-message] - -$ git log --diff-filter=[A|M|D] - -$ git log --follow --stat --diff-filter=[A|M|D] -- - -$ git log --oneline --left-right master..other - -$ git log --oneline --left-right master...other - -$ git name-rev [commit-ref] -``` - -{% capture notes %} -* Log is like a search engine -* Search for person, time, change, contents, message -* Dramatically narrows search time - -https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/advanced/reordering-history/0001-01-01-basic.md b/slides/_posts/advanced/reordering-history/0001-01-01-basic.md deleted file mode 100644 index 538b7bcfe..000000000 --- a/slides/_posts/advanced/reordering-history/0001-01-01-basic.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -chapter: Reordering history -layout: slide -title: '' -tags: -- reordering-history ---- - -{% capture notes %} -* Reorder commits -* Rewrite history entirely -* Discard commits -* Revise/edit commits -* Safe patterns for rebasing local history -* Verbs (cheat sheet of commands) -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git rebase -i -``` diff --git a/slides/_posts/advanced/reordering-history/0002-01-01-with-branch.md b/slides/_posts/advanced/reordering-history/0002-01-01-with-branch.md deleted file mode 100644 index 0a7be327f..000000000 --- a/slides/_posts/advanced/reordering-history/0002-01-01-with-branch.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: Reordering history -layout: slide -title: '' -tags: -- reordering-history ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git rebase -i [remote]/[branch] -``` diff --git a/slides/_posts/advanced/reordering-history/0003-01-01-autosquash.md b/slides/_posts/advanced/reordering-history/0003-01-01-autosquash.md deleted file mode 100644 index 85b5a3334..000000000 --- a/slides/_posts/advanced/reordering-history/0003-01-01-autosquash.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -chapter: Reordering history -layout: slide -title: '' -tags: -- reordering-history ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - - -Automatically arrange commits and rebase with `fixup!` and `squash!` message prefixes - -```bash -$ git rebase -i --autosquash [ref] -``` diff --git a/slides/_posts/advanced/reviewing-synchronizing/0001-01-01-reviewing-remote-branches.md b/slides/_posts/advanced/reviewing-synchronizing/0001-01-01-reviewing-remote-branches.md deleted file mode 100644 index 3a904d65a..000000000 --- a/slides/_posts/advanced/reviewing-synchronizing/0001-01-01-reviewing-remote-branches.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -chapter: Reviewing & synchronizing -layout: slide -title: '' -tags: -- reviewing-synchronizing ---- - -{% capture notes %} -* PRs to horizontal contributors -* PRs multiple levels up -* Converting issues to PRs -* PRs as Issues with code -* Automatic closing of PRs by local merges -* Merges must be _made by recursive_ -* Retrieving PRs locally to resolve conflicts -(without locally merging to target branch) -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git ls-remote origin -$ git fetch origin refs/pull/1/head - -$ git show FETCH_HEAD -$ git merge --no-commit --no-ff FETCH_HEAD -``` diff --git a/slides/_posts/advanced/reviewing-synchronizing/0002-01-01-examining-remote-branches.md b/slides/_posts/advanced/reviewing-synchronizing/0002-01-01-examining-remote-branches.md deleted file mode 100644 index 8d8b79425..000000000 --- a/slides/_posts/advanced/reviewing-synchronizing/0002-01-01-examining-remote-branches.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -chapter: Reviewing & synchronizing -layout: slide -title: '' -tags: -- reviewing-synchronizing ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - - - -```bash -$ git remote -v -$ git remote show -$ git ls-remote -$ git branch -vv -``` diff --git a/slides/_posts/advanced/reviewing-synchronizing/0003-01-01-retrieving-any-commits.md b/slides/_posts/advanced/reviewing-synchronizing/0003-01-01-retrieving-any-commits.md deleted file mode 100644 index 2710cf2a4..000000000 --- a/slides/_posts/advanced/reviewing-synchronizing/0003-01-01-retrieving-any-commits.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Reviewing & synchronizing -layout: slide -title: '' -tags: -- reviewing-synchronizing ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git pull [remote] [pull-request-namespace] - -$ git fetch [remote] [pull-request-namespace] -``` diff --git a/slides/_posts/advanced/reviewing-synchronizing/0004-01-01-retrieving-temporary-remote.md b/slides/_posts/advanced/reviewing-synchronizing/0004-01-01-retrieving-temporary-remote.md deleted file mode 100644 index ec9a27ccc..000000000 --- a/slides/_posts/advanced/reviewing-synchronizing/0004-01-01-retrieving-temporary-remote.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -chapter: Reviewing & synchronizing -layout: slide -title: '' -tags: -- reviewing-synchronizing ---- - -{% capture notes %} -Placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - - -```bash -$ git fetch -$ git checkout FETCH_HEAD -$ git branch FETCH_HEAD -``` diff --git a/slides/_posts/advanced/rewriting-history/0001-01-01-basic.md b/slides/_posts/advanced/rewriting-history/0001-01-01-basic.md deleted file mode 100644 index 20659cf3d..000000000 --- a/slides/_posts/advanced/rewriting-history/0001-01-01-basic.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -chapter: Rewriting history -layout: slide -title: '' -tags: -- rewriting-history ---- - -{% capture notes %} -* Branch Preparation -* Rebasing __is not__ merging -* Conflicts can occur -* Resolution is simple -* Small variation to merge conflict -{% endcapture %} -{% include hydeslides/core/notes %} - -Re-playing branch-specific commits against a base - -```bash -$ git checkout -$ git rebase master -``` diff --git a/slides/_posts/advanced/rewriting-history/0001-01-01-config.md b/slides/_posts/advanced/rewriting-history/0001-01-01-config.md deleted file mode 100644 index 7977f90c2..000000000 --- a/slides/_posts/advanced/rewriting-history/0001-01-01-config.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Rewriting history -layout: slide -title: '' -tags: -- rewriting-history ---- - -{% capture notes %} -Note placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -Configuring all `pull` for tracking branches to replay local commits ahead of upstream - -```bash -$ git config pull.rebase true -``` diff --git a/slides/_posts/advanced/rewriting-history/0001-01-01-conflicts.md b/slides/_posts/advanced/rewriting-history/0001-01-01-conflicts.md deleted file mode 100644 index 5961f12b2..000000000 --- a/slides/_posts/advanced/rewriting-history/0001-01-01-conflicts.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -chapter: Rewriting history -layout: slide -title: '' -tags: -- rewriting-history ---- - -{% capture notes %} -Note placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - - -Resolving a conflict during a rebase - -```bash -$ git add [conflicting-file] -$ git rebase --continue -``` diff --git a/slides/_posts/advanced/rewriting-history/0001-01-01-diagram.md b/slides/_posts/advanced/rewriting-history/0001-01-01-diagram.md deleted file mode 100644 index a9dfd2284..000000000 --- a/slides/_posts/advanced/rewriting-history/0001-01-01-diagram.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: Rewriting history -layout: slide -title: '' -tags: -- rewriting-history -diagram_svg_path: "assets/diagrams/rebase.svg" ---- - -{% capture notes %} -Note placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/advanced/signing-work/0001-01-01-by-commit-message.md b/slides/_posts/advanced/signing-work/0001-01-01-by-commit-message.md deleted file mode 100644 index ec3ca541c..000000000 --- a/slides/_posts/advanced/signing-work/0001-01-01-by-commit-message.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -chapter: Signing work -layout: slide -title: '' -tags: -- signing-work ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -Using an auto-inserted text block to commit messages - -``` -$ git commit -s -$ git commit --signoff -``` diff --git a/slides/_posts/advanced/signing-work/0003-01-01-using-gpg-on-commits.md b/slides/_posts/advanced/signing-work/0003-01-01-using-gpg-on-commits.md deleted file mode 100644 index 531cfc4d7..000000000 --- a/slides/_posts/advanced/signing-work/0003-01-01-using-gpg-on-commits.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -chapter: Signing work -layout: slide -title: '' -tags: -- signing-work ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -Using GPG - -``` -$ git commit -S - -$ git log --show-signature -``` diff --git a/slides/_posts/advanced/signing-work/0003-01-01-using-gpg-on-tags.md b/slides/_posts/advanced/signing-work/0003-01-01-using-gpg-on-tags.md deleted file mode 100644 index 4e613aaf7..000000000 --- a/slides/_posts/advanced/signing-work/0003-01-01-using-gpg-on-tags.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -chapter: Signing work -layout: slide -title: '' -tags: -- signing-work ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -``` -$ git config --global user.signingkey -``` - -``` -$ git merge --verify-signatures -``` - -``` -$ git tag -s [tag-name] [commit] - -$ git tag -v [tag-name] -``` diff --git a/slides/_posts/advanced/temporary-changes/0001-01-01-stash.md b/slides/_posts/advanced/temporary-changes/0001-01-01-stash.md deleted file mode 100644 index 8351d2320..000000000 --- a/slides/_posts/advanced/temporary-changes/0001-01-01-stash.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -chapter: Temporary changes -layout: slide -title: '' -tags: -- temporary-changes ---- - -{% capture notes %} -* Name your stash -* List stashes -* Use specific stashes -{% endcapture %} -{% include hydeslides/core/notes %} - -```bash -$ git stash -$ git stash list -$ git stash pop -$ git stash drop -$ git stash clear -$ git stash -p -``` diff --git a/slides/_posts/advanced/understanding-git/0001-01-01-data-structure.md b/slides/_posts/advanced/understanding-git/0001-01-01-data-structure.md deleted file mode 100644 index 82f5b6002..000000000 --- a/slides/_posts/advanced/understanding-git/0001-01-01-data-structure.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -chapter: Understanding Git -layout: slide -title: '' -tags: -- understanding-git -diagram_svg_path: "assets/diagrams/commit-data-structure.svg" ---- - -{% capture notes %} -* Directed acyclic graph -* Tree object -* Blob object -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/advanced/understanding-git/0002-01-01-dag.md b/slides/_posts/advanced/understanding-git/0002-01-01-dag.md deleted file mode 100644 index a79ccbfae..000000000 --- a/slides/_posts/advanced/understanding-git/0002-01-01-dag.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -chapter: Understanding Git -layout: slide -title: '' -tags: -- understanding-git -diagram_svg_path: "assets/diagrams/commit-dag.svg" ---- - -{% capture notes %} -* Directed acyclic graph -* Tree object -* Blob object -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/branches/0001-01-01-diagram.md b/slides/_posts/foundations/branches/0001-01-01-diagram.md deleted file mode 100644 index 84d9114a1..000000000 --- a/slides/_posts/foundations/branches/0001-01-01-diagram.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: Branches -layout: slide -title: '' -tags: -- branches -diagram_svg_path: "assets/diagrams/what-is-a-branch.svg" ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/collaboration/0001-01-01-fork.md b/slides/_posts/foundations/collaboration/0001-01-01-fork.md deleted file mode 100644 index d7eb5f95c..000000000 --- a/slides/_posts/foundations/collaboration/0001-01-01-fork.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: Collaboration -layout: slide -title: '' -tags: -- collaboration -diagram_svg_path: "assets/diagrams/fork-structure.svg" ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/collaboration/0002-01-01-direct.md b/slides/_posts/foundations/collaboration/0002-01-01-direct.md deleted file mode 100644 index 71932de36..000000000 --- a/slides/_posts/foundations/collaboration/0002-01-01-direct.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: Collaboration -layout: slide -title: '' -tags: -- collaboration -diagram_svg_path: "assets/diagrams/direct-contribution.svg" ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/getting-started/0001-01-01-title.md b/slides/_posts/foundations/getting-started/0001-01-01-title.md deleted file mode 100644 index deeb29e24..000000000 --- a/slides/_posts/foundations/getting-started/0001-01-01-title.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: Getting started -layout: slide -title: '' -tags: -- getting-started ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/git-concepts/0001-01-01-diagram.md b/slides/_posts/foundations/git-concepts/0001-01-01-diagram.md deleted file mode 100644 index 6f3a8b5ae..000000000 --- a/slides/_posts/foundations/git-concepts/0001-01-01-diagram.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: Git concepts -layout: slide -title: '' -tags: -- git-concepts -diagram_svg_path: "assets/diagrams/distributed-version-control.svg" ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/git-concepts/0002-01-01-list.md b/slides/_posts/foundations/git-concepts/0002-01-01-list.md deleted file mode 100644 index 9a289db26..000000000 --- a/slides/_posts/foundations/git-concepts/0002-01-01-list.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: Git concepts -layout: slide -title: '' -tags: -- git-concepts ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -* Repository -* Commit -* Branch diff --git a/slides/_posts/foundations/github-concepts/0001-01-01-title.md b/slides/_posts/foundations/github-concepts/0001-01-01-title.md deleted file mode 100644 index 3dfd8517d..000000000 --- a/slides/_posts/foundations/github-concepts/0001-01-01-title.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -chapter: GitHub concepts -layout: slide -title: '' -tags: -- github-concepts ---- - -{% capture notes %} -* Hosting repositories -* Collaborating on code, documents, text -* Controlling access & contributions - * Permissions - * Forks - * Users - * Organizations -* Tracking assignments, tickets, bugs -* Hosting supporting documentation (GH-Pages) - * https://pages.github.com/ -* Discovering trending technology (Explore) - * https://github.com/explore -* Tracking favorite projects (Stars) - * https://github.com/stars -{% endcapture %} -{% include hydeslides/core/notes %} - -* Repository -* Branch -* Pull Request -* Issues -* Organizations -* Teams diff --git a/slides/_posts/foundations/github-features/0001-01-01-features.md b/slides/_posts/foundations/github-features/0001-01-01-features.md deleted file mode 100644 index 6619faa5c..000000000 --- a/slides/_posts/foundations/github-features/0001-01-01-features.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: GitHub Features -layout: slide -title: '' -tags: -- github-features ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -* Repository *watching* and *starring* -* Gist "light weight" repos -* GitHub flavored Markdown diff --git a/slides/_posts/foundations/github-visualizations/0001-01-01-title.md b/slides/_posts/foundations/github-visualizations/0001-01-01-title.md deleted file mode 100644 index c38db892b..000000000 --- a/slides/_posts/foundations/github-visualizations/0001-01-01-title.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: GitHub visualizations -layout: slide -title: '' -tags: -- github-visualizations ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/history-synchronization/0001-01-01-client-sync.md b/slides/_posts/foundations/history-synchronization/0001-01-01-client-sync.md deleted file mode 100644 index 347724770..000000000 --- a/slides/_posts/foundations/history-synchronization/0001-01-01-client-sync.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: History synchronization -layout: slide -title: '' -tags: -- history-synchronization -diagram_svg_path: "assets/diagrams/sync.svg" ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/history-synchronization/0002-01-01-command-line.md b/slides/_posts/foundations/history-synchronization/0002-01-01-command-line.md deleted file mode 100644 index 8d5b5cba5..000000000 --- a/slides/_posts/foundations/history-synchronization/0002-01-01-command-line.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: History synchronization -layout: slide -title: '' -tags: -- history-synchronization ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - - -``` -$ git pull --rebase -$ git push origin [master|branch] -``` diff --git a/slides/_posts/foundations/local-repository/0001-01-01-list.md b/slides/_posts/foundations/local-repository/0001-01-01-list.md deleted file mode 100644 index 1bf5affe6..000000000 --- a/slides/_posts/foundations/local-repository/0001-01-01-list.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: Local repository -layout: slide -title: '' -tags: -- local-repository ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -* Initialize repositories -* Craft file versions -* Create branches diff --git a/slides/_posts/foundations/merges/0001-01-01-list.md b/slides/_posts/foundations/merges/0001-01-01-list.md deleted file mode 100644 index 2c3556643..000000000 --- a/slides/_posts/foundations/merges/0001-01-01-list.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -chapter: Merges -layout: slide -title: '' -tags: -- merges ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -* Integrate with Pull Requests -* Combine locally with GUIs diff --git a/slides/_posts/foundations/project-management/0001-01-01-features.md b/slides/_posts/foundations/project-management/0001-01-01-features.md deleted file mode 100644 index 68ce34a7b..000000000 --- a/slides/_posts/foundations/project-management/0001-01-01-features.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -chapter: Project management -layout: slide -title: '' -tags: -- project-management ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -* GitHub Issues -* Milestones -* Network -* Pulse -* Tags, Releases -* Collaborators -* Organizations -* Teams diff --git a/slides/_posts/foundations/repository-creation/0001-01-01-overview.md b/slides/_posts/foundations/repository-creation/0001-01-01-overview.md deleted file mode 100644 index 3fa035608..000000000 --- a/slides/_posts/foundations/repository-creation/0001-01-01-overview.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -chapter: Repository creation -layout: slide -title: '' -tags: -- repository-creation ---- - -{% capture notes %} -* Visit GitHub.com -* Project access control (public/private) -* Repository creation -* Seed files (`README`, `.gitignore`, `license.md`) -* Edits/commits through web interface -* Concepts of hosted repository -* Repository based on existing content -* Web interface and GUI client -* Clone command explanation -{% endcapture %} -{% include hydeslides/core/notes %} - -* Via GitHub -* With GUI -* On command line diff --git a/slides/_posts/foundations/repository-creation/0002-01-01-clone.md b/slides/_posts/foundations/repository-creation/0002-01-01-clone.md deleted file mode 100644 index 2303300dd..000000000 --- a/slides/_posts/foundations/repository-creation/0002-01-01-clone.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: Repository creation -layout: slide -title: '' -tags: -- repository-creation -diagram_svg_path: "assets/diagrams/repo-clone.svg" ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} diff --git a/slides/_posts/foundations/web-flow/0001-01-01-list.md b/slides/_posts/foundations/web-flow/0001-01-01-list.md deleted file mode 100644 index 18de3b807..000000000 --- a/slides/_posts/foundations/web-flow/0001-01-01-list.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -chapter: GitHub web flow -layout: slide -title: '' -tags: -- web-flow ---- - -{% capture notes %} -Notes placeholder -{% endcapture %} -{% include hydeslides/core/notes %} - -* Browse projects -* Start branches -* Create files -* Edit content -* Change paths -* Open Pull Requests diff --git a/slides/_posts/intermediate/distributed-repositories/0001-01-01-diagram.md b/slides/_posts/intermediate/distributed-repositories/0001-01-01-diagram.md deleted file mode 100644 index e6c3d044f..000000000 --- a/slides/_posts/intermediate/distributed-repositories/0001-01-01-diagram.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Distributed repositories -layout: slide -title: '' -tags: -- distributed-repositories -diagram_svg_path: "assets/diagrams/distributed-version-control.svg" ---- diff --git a/slides/_posts/intermediate/distributed-repositories/0002-01-01-git-remote.md b/slides/_posts/intermediate/distributed-repositories/0002-01-01-git-remote.md deleted file mode 100644 index b91e3cd26..000000000 --- a/slides/_posts/intermediate/distributed-repositories/0002-01-01-git-remote.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -chapter: Distributed repositories -layout: slide -title: '' -tags: -- distributed-repositories ---- - -```bash -# List remote "bookmarks", if any -$ git remote -``` - -```bash -# Add a remote "bookmark" -$ git remote add [name] [url] -``` diff --git a/slides/_posts/intermediate/file-lifecycle/0001-01-01-overview.md b/slides/_posts/intermediate/file-lifecycle/0001-01-01-overview.md deleted file mode 100644 index 7215bf14a..000000000 --- a/slides/_posts/intermediate/file-lifecycle/0001-01-01-overview.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -chapter: File lifecycle -layout: slide -title: '' -tags: -- file-lifecycle - -diagram_svg_path: "assets/diagrams/states-of-tracking.svg" ---- diff --git a/slides/_posts/intermediate/file-lifecycle/0002-01-01-git-rm.md b/slides/_posts/intermediate/file-lifecycle/0002-01-01-git-rm.md deleted file mode 100644 index 3927d09bb..000000000 --- a/slides/_posts/intermediate/file-lifecycle/0002-01-01-git-rm.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: File lifecycle -layout: slide -title: '' -tags: -- file-lifecycle ---- - -```bash -# Permanently delete file, stage for commit -$ git rm [file] -``` diff --git a/slides/_posts/intermediate/file-lifecycle/0003-01-01-git-rm-cached.md b/slides/_posts/intermediate/file-lifecycle/0003-01-01-git-rm-cached.md deleted file mode 100644 index e785383a5..000000000 --- a/slides/_posts/intermediate/file-lifecycle/0003-01-01-git-rm-cached.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: File lifecycle -layout: slide -title: '' -tags: -- file-lifecycle ---- - -```bash -# Stop version tracking, stage for commit -$ git rm --cached [file] -``` diff --git a/slides/_posts/intermediate/file-lifecycle/0004-01-01-git-add-options.md b/slides/_posts/intermediate/file-lifecycle/0004-01-01-git-add-options.md deleted file mode 100644 index 7631a5238..000000000 --- a/slides/_posts/intermediate/file-lifecycle/0004-01-01-git-add-options.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: File lifecycle -layout: slide -title: '' -tags: -- file-lifecycle ---- - -```bash -# Stage all updated files -$ git add -u [file|pattern] - -# Stage all files no matter the state -$ git add -A [file|pattern] - -``` diff --git a/slides/_posts/intermediate/file-lifecycle/0005-01-01-git-mv.md b/slides/_posts/intermediate/file-lifecycle/0005-01-01-git-mv.md deleted file mode 100644 index 5e51c17c3..000000000 --- a/slides/_posts/intermediate/file-lifecycle/0005-01-01-git-mv.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: File lifecycle -layout: slide -title: '' -tags: -- file-lifecycle ---- - -```bash -# Change the path of a file -$ git mv [path] -``` diff --git a/slides/_posts/intermediate/file-lifecycle/0006-01-01-git-log-m.md b/slides/_posts/intermediate/file-lifecycle/0006-01-01-git-log-m.md deleted file mode 100644 index e9b9815ae..000000000 --- a/slides/_posts/intermediate/file-lifecycle/0006-01-01-git-log-m.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: File lifecycle -layout: slide -title: '' -tags: -- file-lifecycle ---- - -```bash -# Show history including those with prior path names -$ git log --stat -M -``` diff --git a/slides/_posts/intermediate/getting-started/0001-01-01-git-init.md b/slides/_posts/intermediate/getting-started/0001-01-01-git-init.md deleted file mode 100644 index a90aebced..000000000 --- a/slides/_posts/intermediate/getting-started/0001-01-01-git-init.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -chapter: Getting started -layout: slide -title: '' -tags: -- getting-started ---- - -```bash -# New project -$ git init newproject -$ cd newproject -# ...start coding -``` - -```bash -# Existing project -$ cd existingproject -$ git init -# ...start coding -``` diff --git a/slides/_posts/intermediate/getting-started/0002-01-01-git-clone.md b/slides/_posts/intermediate/getting-started/0002-01-01-git-clone.md deleted file mode 100644 index 8af0c48ee..000000000 --- a/slides/_posts/intermediate/getting-started/0002-01-01-git-clone.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Getting started -layout: slide -title: '' -tags: -- getting-started ---- - -```bash -$ git clone [repository-url] -``` diff --git a/slides/_posts/intermediate/local-workflows/0001-01-01-organizing-history.md b/slides/_posts/intermediate/local-workflows/0001-01-01-organizing-history.md deleted file mode 100644 index de6cb0a76..000000000 --- a/slides/_posts/intermediate/local-workflows/0001-01-01-organizing-history.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Local workflows -layout: slide -title: '' -tags: -- local-workflows -diagram_svg_path: "assets/diagrams/what-is-a-branch.svg" ---- diff --git a/slides/_posts/intermediate/local-workflows/0002-01-01-git-branch.md b/slides/_posts/intermediate/local-workflows/0002-01-01-git-branch.md deleted file mode 100644 index 891160428..000000000 --- a/slides/_posts/intermediate/local-workflows/0002-01-01-git-branch.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Local workflows -layout: slide -title: '' -tags: -- local-workflows ---- - -```bash -# List branches, identify current brach -$ git branch - -# Create a new branch from current branch -$ git branch [name] - -# Switch to a different branch -$ git checkout [name] -``` diff --git a/slides/_posts/intermediate/local-workflows/0003-01-01-option-switches.md b/slides/_posts/intermediate/local-workflows/0003-01-01-option-switches.md deleted file mode 100644 index 9f2eeec6e..000000000 --- a/slides/_posts/intermediate/local-workflows/0003-01-01-option-switches.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Local workflows -layout: slide -title: '' -tags: -- local-workflows ---- - -```bash -# Rename any branch -$ git branch -m [current-name] [new-name] - -# Delete a *reachable* branch -$ git branch -d [name] - -# Delete whether or not reachable -$ git branch -D [name] -``` diff --git a/slides/_posts/intermediate/local-workflows/0004-01-01-git-merge.md b/slides/_posts/intermediate/local-workflows/0004-01-01-git-merge.md deleted file mode 100644 index 8085044e0..000000000 --- a/slides/_posts/intermediate/local-workflows/0004-01-01-git-merge.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: Local workflows -layout: slide -title: '' -tags: -- local-workflows ---- - -```bash -# Integrate history of specified branch into current one -$ git merge [branch] -``` diff --git a/slides/_posts/intermediate/local-workflows/0005-01-01-merge-fast-forward.md b/slides/_posts/intermediate/local-workflows/0005-01-01-merge-fast-forward.md deleted file mode 100644 index 9e6037e91..000000000 --- a/slides/_posts/intermediate/local-workflows/0005-01-01-merge-fast-forward.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Local workflows -layout: slide -title: '' -tags: -- local-workflows -diagram_svg_path: "assets/diagrams/merge-fast-forward.svg" ---- diff --git a/slides/_posts/intermediate/local-workflows/0006-01-01-merge-recursive.md b/slides/_posts/intermediate/local-workflows/0006-01-01-merge-recursive.md deleted file mode 100644 index b845a0b70..000000000 --- a/slides/_posts/intermediate/local-workflows/0006-01-01-merge-recursive.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Local workflows -layout: slide -title: '' -tags: -- local-workflows -diagram_svg_path: "assets/diagrams/merge-recursive.svg" ---- diff --git a/slides/_posts/intermediate/recovering-anything/0001-01-01-reflog.md b/slides/_posts/intermediate/recovering-anything/0001-01-01-reflog.md deleted file mode 100644 index 67a50192c..000000000 --- a/slides/_posts/intermediate/recovering-anything/0001-01-01-reflog.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Recovering anything -layout: slide -title: '' -tags: -- recovering-anything ---- - -```bash -$ git reflog -``` diff --git a/slides/_posts/intermediate/recovering-anything/0002-01-01-reflog-reset.md b/slides/_posts/intermediate/recovering-anything/0002-01-01-reflog-reset.md deleted file mode 100644 index b5c7de2f8..000000000 --- a/slides/_posts/intermediate/recovering-anything/0002-01-01-reflog-reset.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Recovering anything -layout: slide -title: '' -tags: -- recovering-anything ---- - -```bash -$ git reset --[option] HEAD@{[n]} -``` diff --git a/slides/_posts/intermediate/recovering-anything/0003-01-01-reflog-for-paths.md b/slides/_posts/intermediate/recovering-anything/0003-01-01-reflog-for-paths.md deleted file mode 100644 index ea8a94de9..000000000 --- a/slides/_posts/intermediate/recovering-anything/0003-01-01-reflog-for-paths.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Recovering anything -layout: slide -title: '' -tags: -- recovering-anything ---- - -```bash -$ git checkout HEAD@{[n]} -- [path] -``` diff --git a/slides/_posts/intermediate/remote-workflows/0001-01-01-fork-diagram.md b/slides/_posts/intermediate/remote-workflows/0001-01-01-fork-diagram.md deleted file mode 100644 index f7f4a086b..000000000 --- a/slides/_posts/intermediate/remote-workflows/0001-01-01-fork-diagram.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Remote workflows -layout: slide -title: '' -tags: -- remote-workflows -diagram_svg_path: "assets/diagrams/fork-structure.svg" ---- diff --git a/slides/_posts/intermediate/remote-workflows/0001-01-01-git-clone-reminder.md b/slides/_posts/intermediate/remote-workflows/0001-01-01-git-clone-reminder.md deleted file mode 100644 index b09670169..000000000 --- a/slides/_posts/intermediate/remote-workflows/0001-01-01-git-clone-reminder.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Distributed repositories -layout: slide -title: '' -tags: -- remote-workflows ---- - -```bash -$ git clone [repository-url] -``` diff --git a/slides/_posts/intermediate/remote-workflows/0002-01-01-pull-rebase-config.md b/slides/_posts/intermediate/remote-workflows/0002-01-01-pull-rebase-config.md deleted file mode 100644 index 9cb81c7f3..000000000 --- a/slides/_posts/intermediate/remote-workflows/0002-01-01-pull-rebase-config.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Remote workflows -layout: slide -title: '' -tags: -- remote-workflows ---- - -```bash -$ git config --[scope] pull.rebase true -``` diff --git a/slides/_posts/intermediate/remote-workflows/0003-01-01-retrieving-branch-changes.md b/slides/_posts/intermediate/remote-workflows/0003-01-01-retrieving-branch-changes.md deleted file mode 100644 index 582c63873..000000000 --- a/slides/_posts/intermediate/remote-workflows/0003-01-01-retrieving-branch-changes.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -chapter: Remote workflows -layout: slide -title: '' -tags: -- remote-workflows ---- - -```bash -# Retrieve all remote branches, then list them -$ git fetch -$ git branch -a - -# Temporarily retrieve a repository's branch -$ git fetch [remote] [branch] -``` diff --git a/slides/_posts/intermediate/remote-workflows/0003-01-01-retrieving-changes.md b/slides/_posts/intermediate/remote-workflows/0003-01-01-retrieving-changes.md deleted file mode 100644 index 9b36e6b42..000000000 --- a/slides/_posts/intermediate/remote-workflows/0003-01-01-retrieving-changes.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -chapter: Distributed repositories -layout: slide -title: '' -tags: -- remote-workflows ---- - -```bash -# Retrieve remote history and update working tree -$ git pull -``` - -```bash -# Only retrieve remote history -$ git fetch - -$ git branch -r -``` diff --git a/slides/_posts/intermediate/remote-workflows/0004-01-01-sharing-changes.md b/slides/_posts/intermediate/remote-workflows/0004-01-01-sharing-changes.md deleted file mode 100644 index bf715a34a..000000000 --- a/slides/_posts/intermediate/remote-workflows/0004-01-01-sharing-changes.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -chapter: Distributed repositories -layout: slide -title: '' -tags: -- remote-workflows ---- - -```bash -# Send branch's commit to specific remote -$ git push [remote] [branch] -``` - -```bash -# Setup and publish branch's commits -$ git push -u [remote] [branch] -``` - -```bash -# Send any local commits to the tracking upstream branch -$ git push -``` diff --git a/slides/_posts/intermediate/remote-workflows/0005-01-01-diagram.md b/slides/_posts/intermediate/remote-workflows/0005-01-01-diagram.md deleted file mode 100644 index e261b3de4..000000000 --- a/slides/_posts/intermediate/remote-workflows/0005-01-01-diagram.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Distributed repositories -layout: slide -title: '' -tags: -- remote-workflows -diagram_svg_path: "assets/diagrams/network.svg" ---- diff --git a/slides/_posts/intermediate/reviewing-changes/0001-01-01-git-log.md b/slides/_posts/intermediate/reviewing-changes/0001-01-01-git-log.md deleted file mode 100644 index dd068173c..000000000 --- a/slides/_posts/intermediate/reviewing-changes/0001-01-01-git-log.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Reviewing changes -layout: slide -title: '' -tags: -- reviewing-changes ---- - -```bash -$ git log -``` diff --git a/slides/_posts/intermediate/reviewing-changes/0002-01-01-option-switches.md b/slides/_posts/intermediate/reviewing-changes/0002-01-01-option-switches.md deleted file mode 100644 index 24f957511..000000000 --- a/slides/_posts/intermediate/reviewing-changes/0002-01-01-option-switches.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -chapter: Reviewing changes -layout: slide -title: '' -tags: -- reviewing-changes ---- - - -```bash -# Simple commit summaries -$ git log --oneline -``` - - -```bash -# Option switches common with `diff` -$ git log --patch --color-words -``` diff --git a/slides/_posts/intermediate/reviewing-changes/0003-01-01-filtering.md b/slides/_posts/intermediate/reviewing-changes/0003-01-01-filtering.md deleted file mode 100644 index db8eeeffd..000000000 --- a/slides/_posts/intermediate/reviewing-changes/0003-01-01-filtering.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Reviewing changes -layout: slide -title: '' -tags: -- reviewing-changes ---- - -```bash -# Limit history from HEAD -$ git log -[n] -``` - -```bash -$ git log --author [author-name] -$ git log -S [string-in-patch] -$ git log -G [regex-matching-commit-message] -``` diff --git a/slides/_posts/intermediate/reviewing-modifications/0001-01-01-diagram.md b/slides/_posts/intermediate/reviewing-modifications/0001-01-01-diagram.md deleted file mode 100644 index 0a154d24c..000000000 --- a/slides/_posts/intermediate/reviewing-modifications/0001-01-01-diagram.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Reviewing modifications -layout: slide -title: '' -tags: -- reviewing-modifications -diagram_svg_path: "assets/diagrams/diff.svg" ---- diff --git a/slides/_posts/intermediate/reviewing-modifications/0001-01-01-git-diff.md b/slides/_posts/intermediate/reviewing-modifications/0001-01-01-git-diff.md deleted file mode 100644 index 395efddc0..000000000 --- a/slides/_posts/intermediate/reviewing-modifications/0001-01-01-git-diff.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Reviewing modifications -layout: slide -title: '' -tags: -- reviewing-modifications ---- - -```bash -$ git diff -``` diff --git a/slides/_posts/intermediate/reviewing-modifications/0002-01-01-option-switches.md b/slides/_posts/intermediate/reviewing-modifications/0002-01-01-option-switches.md deleted file mode 100644 index 31ef41c40..000000000 --- a/slides/_posts/intermediate/reviewing-modifications/0002-01-01-option-switches.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -chapter: Reviewing modifications -layout: slide -title: '' -tags: -- reviewing-modifications ---- - -```bash -# Highlight word changes on lines -$ git diff --color-words - -# By specific file -$ git diff [file-path] -``` diff --git a/slides/_posts/intermediate/reviewing-modifications/0003-01-01-git-diff-staged.md b/slides/_posts/intermediate/reviewing-modifications/0003-01-01-git-diff-staged.md deleted file mode 100644 index fce5f9255..000000000 --- a/slides/_posts/intermediate/reviewing-modifications/0003-01-01-git-diff-staged.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Reviewing modifications -layout: slide -title: '' -tags: -- reviewing-modifications ---- - -```bash -$ git diff --staged -``` diff --git a/slides/_posts/intermediate/setup/0001-01-01-name-email-config.md b/slides/_posts/intermediate/setup/0001-01-01-name-email-config.md deleted file mode 100644 index c0046d48a..000000000 --- a/slides/_posts/intermediate/setup/0001-01-01-name-email-config.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: Setup -layout: slide -title: '' -tags: -- setup ---- - -```bash -$ git config user.name "[name]" -$ git config user.email "octocat@github.com" -``` diff --git a/slides/_posts/intermediate/setup/0002-01-01-scopes.md b/slides/_posts/intermediate/setup/0002-01-01-scopes.md deleted file mode 100644 index b98ae99d4..000000000 --- a/slides/_posts/intermediate/setup/0002-01-01-scopes.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: Setup -layout: slide -title: '' -tags: -- setup ---- - -```bash -$ git config --system [name] [value] -$ git config --global [name] [value] -$ git config --local [name] [value] -``` diff --git a/slides/_posts/intermediate/setup/0003-01-01-list.md b/slides/_posts/intermediate/setup/0003-01-01-list.md deleted file mode 100644 index 86ed80cac..000000000 --- a/slides/_posts/intermediate/setup/0003-01-01-list.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: Setup -layout: slide -title: '' -tags: -- setup ---- - - -```bash -$ git config --list --[scope] -``` diff --git a/slides/_posts/intermediate/setup/0004-01-01-extras.md b/slides/_posts/intermediate/setup/0004-01-01-extras.md deleted file mode 100644 index ea8e61bdd..000000000 --- a/slides/_posts/intermediate/setup/0004-01-01-extras.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -chapter: Setup -layout: slide -title: '' -tags: -- setup ---- - -```bash -$ git config --[scope] color.ui auto - -$ git config --[scope] core.autocrlf [input|true] -``` diff --git a/slides/_posts/intermediate/undoing-changes/0001-01-01-git-revert.md b/slides/_posts/intermediate/undoing-changes/0001-01-01-git-revert.md deleted file mode 100644 index f57d49aff..000000000 --- a/slides/_posts/intermediate/undoing-changes/0001-01-01-git-revert.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: Undoing changes -layout: slide -title: '' -tags: -- undoing-changes ---- - -```bash -# Create a new commit undoing the patch in that specified -$ git revert [commit] -``` diff --git a/slides/_posts/intermediate/undoing-changes/0002-01-01-git-reset.md b/slides/_posts/intermediate/undoing-changes/0002-01-01-git-reset.md deleted file mode 100644 index 93597ee13..000000000 --- a/slides/_posts/intermediate/undoing-changes/0002-01-01-git-reset.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -chapter: Undoing changes -layout: slide -title: '' -tags: -- undoing-changes ---- - -```bash -# Move current branch's HEAD to point in history -$ git reset [commit|branch|tag] -``` diff --git a/slides/_posts/intermediate/undoing-changes/0003-01-01-git-reset-options.md b/slides/_posts/intermediate/undoing-changes/0003-01-01-git-reset-options.md deleted file mode 100644 index 2b4c1ff48..000000000 --- a/slides/_posts/intermediate/undoing-changes/0003-01-01-git-reset-options.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Undoing changes -layout: slide -title: '' -tags: -- undoing-changes ---- - -```bash -# Move HEAD, keep changes in staging -$ git reset --soft [commit|branch|tag] - -# Move HEAD, keep changes, clear staging area -$ git reset --mixed [commit|branch|tag] - -## Move HEAD, discard all uncommited changes -$ git reset --hard [commit|branch|tag] -``` diff --git a/slides/_posts/intermediate/utilities-shortcuts/0001-01-01-aliases.md b/slides/_posts/intermediate/utilities-shortcuts/0001-01-01-aliases.md deleted file mode 100644 index a7f2597fb..000000000 --- a/slides/_posts/intermediate/utilities-shortcuts/0001-01-01-aliases.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -chapter: Utilities & Shortcuts -layout: slide -title: '' -tags: -- utilities-shortcuts ---- - -```bash -# Shortcut to output commit history -$ git config --global alias.l "log --oneline --stat" - -# Quick graph of commit history and branches -$ git config --global alias.lol "log --graph --all --oneline --decorate" - -# Shortuct to repository status -$ git config alias.s "status -s" -``` diff --git a/slides/_posts/intermediate/versioning-content/0001-01-01-git-status.md b/slides/_posts/intermediate/versioning-content/0001-01-01-git-status.md deleted file mode 100644 index 53be56c2f..000000000 --- a/slides/_posts/intermediate/versioning-content/0001-01-01-git-status.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Versioning content -layout: slide -title: '' -tags: -- versioning-content ---- - -```bash -$ git status -``` diff --git a/slides/_posts/intermediate/versioning-content/0002-01-01-git-add.md b/slides/_posts/intermediate/versioning-content/0002-01-01-git-add.md deleted file mode 100644 index 9f54fd8be..000000000 --- a/slides/_posts/intermediate/versioning-content/0002-01-01-git-add.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Getting started -layout: slide -title: '' -tags: -- versioning-content ---- - -```bash -$ git add [filename] -``` diff --git a/slides/_posts/intermediate/versioning-content/0003-01-01-git-commit.md b/slides/_posts/intermediate/versioning-content/0003-01-01-git-commit.md deleted file mode 100644 index f8adbe30f..000000000 --- a/slides/_posts/intermediate/versioning-content/0003-01-01-git-commit.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -chapter: Getting started -layout: slide -title: '' -tags: -- versioning-content ---- - -```bash -$ git commit -m "[your description]" -``` diff --git a/slides/_posts/intermediate/versioning-content/0004-01-01-three-stage-thinking.md b/slides/_posts/intermediate/versioning-content/0004-01-01-three-stage-thinking.md deleted file mode 100644 index 8a1e58ccc..000000000 --- a/slides/_posts/intermediate/versioning-content/0004-01-01-three-stage-thinking.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Getting started -layout: slide -title: '' -tags: -- versioning-content -diagram_svg_path: "assets/diagrams/commit-three-stage.svg" ---- diff --git a/slides/_posts/intermediate/versioning-content/0005-01-01-commit-snapshot.md b/slides/_posts/intermediate/versioning-content/0005-01-01-commit-snapshot.md deleted file mode 100644 index 242f816a2..000000000 --- a/slides/_posts/intermediate/versioning-content/0005-01-01-commit-snapshot.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Getting started -layout: slide -title: '' -tags: -- versioning-content -diagram_svg_path: "assets/diagrams/commit-versions.svg" ---- diff --git a/slides/_posts/intermediate/versioning-content/0006-01-01-commit-dag.md b/slides/_posts/intermediate/versioning-content/0006-01-01-commit-dag.md deleted file mode 100644 index 407ce99c4..000000000 --- a/slides/_posts/intermediate/versioning-content/0006-01-01-commit-dag.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -chapter: Getting started -layout: slide -title: '' -tags: -- versioning-content -diagram_svg_path: "assets/diagrams/commit-dag.svg" ---- diff --git a/slides/_posts/pages/getting-started/0001-01-01-create-the-repo.md b/slides/_posts/pages/getting-started/0001-01-01-create-the-repo.md index d0d1743f3..ef562b6a7 100644 --- a/slides/_posts/pages/getting-started/0001-01-01-create-the-repo.md +++ b/slides/_posts/pages/getting-started/0001-01-01-create-the-repo.md @@ -1,7 +1,7 @@ --- chapter: "Getting Started" cover: true -layout: hydeside + tags: - "pages/getting-started" --- diff --git a/slides/_posts/pages/getting-started/0002-01-01-clone-the-empty-repo.md b/slides/_posts/pages/getting-started/0002-01-01-clone-the-empty-repo.md index 04578ee19..6c3e49c92 100644 --- a/slides/_posts/pages/getting-started/0002-01-01-clone-the-empty-repo.md +++ b/slides/_posts/pages/getting-started/0002-01-01-clone-the-empty-repo.md @@ -1,7 +1,7 @@ --- chapter: "Getting Started" cover: true -layout: hydeside + tags: - "pages/getting-started" --- diff --git a/slides/_posts/pages/getting-started/0003-01-01-create-your-first-page.md b/slides/_posts/pages/getting-started/0003-01-01-create-your-first-page.md index 902a23d31..9c5b13f73 100644 --- a/slides/_posts/pages/getting-started/0003-01-01-create-your-first-page.md +++ b/slides/_posts/pages/getting-started/0003-01-01-create-your-first-page.md @@ -1,7 +1,7 @@ --- chapter: "Getting Started" cover: true -layout: hydeside + tags: - "pages/getting-started" --- diff --git a/slides/_posts/pages/getting-started/0004-01-01-save-your-first-page.md b/slides/_posts/pages/getting-started/0004-01-01-save-your-first-page.md index 13912b3b9..7c1de8e84 100644 --- a/slides/_posts/pages/getting-started/0004-01-01-save-your-first-page.md +++ b/slides/_posts/pages/getting-started/0004-01-01-save-your-first-page.md @@ -1,7 +1,7 @@ --- chapter: "Getting Started" cover: true -layout: hydeside + tags: - "pages/getting-started" --- diff --git a/slides/_posts/pages/getting-started/0005-01-01-publish-your-first-page.md b/slides/_posts/pages/getting-started/0005-01-01-publish-your-first-page.md index 17579f2d2..b5549608c 100644 --- a/slides/_posts/pages/getting-started/0005-01-01-publish-your-first-page.md +++ b/slides/_posts/pages/getting-started/0005-01-01-publish-your-first-page.md @@ -1,7 +1,7 @@ --- chapter: "Getting Started" cover: true -layout: hydeside + tags: - "pages/getting-started" --- diff --git a/slides/_posts/pages/getting-started/0006-01-01-take-a-look.md b/slides/_posts/pages/getting-started/0006-01-01-take-a-look.md index 7f99ba90a..964c48735 100644 --- a/slides/_posts/pages/getting-started/0006-01-01-take-a-look.md +++ b/slides/_posts/pages/getting-started/0006-01-01-take-a-look.md @@ -1,7 +1,7 @@ --- chapter: "Getting Started" cover: true -layout: hydeside + tags: - "pages/getting-started" --- diff --git a/slides/_posts/pages/getting-started/0007-01-01-privacy.md b/slides/_posts/pages/getting-started/0007-01-01-privacy.md index 2bfea013f..21adcc87b 100644 --- a/slides/_posts/pages/getting-started/0007-01-01-privacy.md +++ b/slides/_posts/pages/getting-started/0007-01-01-privacy.md @@ -1,7 +1,7 @@ --- chapter: "Getting Started" cover: true -layout: hydeside + tags: - "pages/getting-started" --- diff --git a/slides/_posts/pages/getting-started/0008-01-01-building-your-first-page.md b/slides/_posts/pages/getting-started/0008-01-01-building-your-first-page.md index 0164860e9..806ce9f1e 100644 --- a/slides/_posts/pages/getting-started/0008-01-01-building-your-first-page.md +++ b/slides/_posts/pages/getting-started/0008-01-01-building-your-first-page.md @@ -1,7 +1,7 @@ --- chapter: "Getting Started" cover: true -layout: hydeside + tags: - "pages/getting-started" --- diff --git a/slides/_posts/pages/jekyll/0001-01-01-introducing-jekyll.md b/slides/_posts/pages/jekyll/0001-01-01-introducing-jekyll.md index b81c5f318..321c21471 100644 --- a/slides/_posts/pages/jekyll/0001-01-01-introducing-jekyll.md +++ b/slides/_posts/pages/jekyll/0001-01-01-introducing-jekyll.md @@ -1,7 +1,7 @@ --- chapter: "Jekyll" cover: true -layout: hydeside + tags: - "pages/jekyll" --- diff --git a/slides/_posts/pages/jekyll/0002-01-01-inception.md b/slides/_posts/pages/jekyll/0002-01-01-inception.md index bc4303ebf..50dade669 100644 --- a/slides/_posts/pages/jekyll/0002-01-01-inception.md +++ b/slides/_posts/pages/jekyll/0002-01-01-inception.md @@ -1,7 +1,7 @@ --- chapter: "Jekyll" cover: true -layout: hydeside + tags: - "pages/jekyll" heading: false diff --git a/slides/_posts/pages/jekyll/0003-01-01-github-pages-serving.md b/slides/_posts/pages/jekyll/0003-01-01-github-pages-serving.md index b7b845a76..d660e651f 100644 --- a/slides/_posts/pages/jekyll/0003-01-01-github-pages-serving.md +++ b/slides/_posts/pages/jekyll/0003-01-01-github-pages-serving.md @@ -1,7 +1,7 @@ --- chapter: "Jekyll" cover: true -layout: hydeside + title: GitHub Pages Serving tags: - "pages/jekyll" diff --git a/slides/_posts/pages/jekyll/0004-01-01-jekyll-processing.md b/slides/_posts/pages/jekyll/0004-01-01-jekyll-processing.md index 9b8e19113..e57723641 100644 --- a/slides/_posts/pages/jekyll/0004-01-01-jekyll-processing.md +++ b/slides/_posts/pages/jekyll/0004-01-01-jekyll-processing.md @@ -1,7 +1,7 @@ --- chapter: "Jekyll" cover: true -layout: hydeside + tags: - "pages/jekyll" --- diff --git a/slides/_posts/pages/jekyll/0005-01-01-yaml.md b/slides/_posts/pages/jekyll/0005-01-01-yaml.md index a03b214b0..ddbc57dfa 100644 --- a/slides/_posts/pages/jekyll/0005-01-01-yaml.md +++ b/slides/_posts/pages/jekyll/0005-01-01-yaml.md @@ -1,7 +1,7 @@ --- chapter: "Jekyll" cover: true -layout: hydeside + title: YAML tags: - "pages/jekyll" diff --git a/slides/_posts/pages/jekyll/0006-01-01-front-matter-example.md b/slides/_posts/pages/jekyll/0006-01-01-front-matter-example.md index c712632be..db2dccf96 100644 --- a/slides/_posts/pages/jekyll/0006-01-01-front-matter-example.md +++ b/slides/_posts/pages/jekyll/0006-01-01-front-matter-example.md @@ -1,7 +1,7 @@ --- chapter: "Jekyll" cover: true -layout: hydeside + tags: - "pages/jekyll" --- diff --git a/slides/_posts/pages/jekyll/0007-01-01-yaml-behavior.md b/slides/_posts/pages/jekyll/0007-01-01-yaml-behavior.md index cb655dd99..3dd3a8cb8 100644 --- a/slides/_posts/pages/jekyll/0007-01-01-yaml-behavior.md +++ b/slides/_posts/pages/jekyll/0007-01-01-yaml-behavior.md @@ -1,7 +1,7 @@ --- chapter: "Jekyll" cover: true -layout: hydeside + title: YAML Behavior tags: - "pages/jekyll" diff --git a/slides/_posts/pages/layouts/0001-01-01-layouts.md b/slides/_posts/pages/layouts/0001-01-01-layouts.md index 617c3a693..ec2f1ca79 100644 --- a/slides/_posts/pages/layouts/0001-01-01-layouts.md +++ b/slides/_posts/pages/layouts/0001-01-01-layouts.md @@ -1,7 +1,7 @@ --- chapter: "Layouts" cover: true -layout: hydeside + tags: - "pages/layouts" --- diff --git a/slides/_posts/pages/layouts/0002-01-01-layout-example.md b/slides/_posts/pages/layouts/0002-01-01-layout-example.md index 01ff41961..59d525436 100644 --- a/slides/_posts/pages/layouts/0002-01-01-layout-example.md +++ b/slides/_posts/pages/layouts/0002-01-01-layout-example.md @@ -1,7 +1,7 @@ --- chapter: "Layouts" cover: true -layout: hydeside + tags: - "pages/layouts" --- diff --git a/slides/_posts/pages/layouts/0003-01-01-but-wait,-there's-more!.md b/slides/_posts/pages/layouts/0003-01-01-but-wait,-there's-more!.md index e7eef7842..32178be97 100644 --- a/slides/_posts/pages/layouts/0003-01-01-but-wait,-there's-more!.md +++ b/slides/_posts/pages/layouts/0003-01-01-but-wait,-there's-more!.md @@ -1,7 +1,7 @@ --- chapter: "Layouts" cover: true -layout: hydeside + tags: - "pages/layouts" --- diff --git a/slides/_posts/pages/layouts/0004-01-01-lets-take-a-look.md b/slides/_posts/pages/layouts/0004-01-01-lets-take-a-look.md index fc0d05611..e1c694d29 100644 --- a/slides/_posts/pages/layouts/0004-01-01-lets-take-a-look.md +++ b/slides/_posts/pages/layouts/0004-01-01-lets-take-a-look.md @@ -1,7 +1,7 @@ --- chapter: "Layouts" cover: true -layout: hydeside + tags: - "pages/layouts" --- diff --git a/slides/_posts/pages/moar-jekyll/0001-01-01-includes.md b/slides/_posts/pages/moar-jekyll/0001-01-01-includes.md index 7900e22ef..ff365619d 100644 --- a/slides/_posts/pages/moar-jekyll/0001-01-01-includes.md +++ b/slides/_posts/pages/moar-jekyll/0001-01-01-includes.md @@ -1,7 +1,7 @@ --- chapter: "Moar Jekyll!" cover: true -layout: hydesides + tags: - "pages/moar-jekyll" --- diff --git a/slides/_posts/pages/moar-jekyll/0002-01-01-where-to-go-from-here.md b/slides/_posts/pages/moar-jekyll/0002-01-01-where-to-go-from-here.md index 0d0dba0f7..f4f997bcb 100644 --- a/slides/_posts/pages/moar-jekyll/0002-01-01-where-to-go-from-here.md +++ b/slides/_posts/pages/moar-jekyll/0002-01-01-where-to-go-from-here.md @@ -1,7 +1,7 @@ --- chapter: "Moar Jekyll!" cover: true -layout: hydesides + tags: - "pages/moar-jekyll" --- diff --git a/slides/_posts/pages/template-data/0001-01-01-using-template-data.md b/slides/_posts/pages/template-data/0001-01-01-using-template-data.md index 60ffcf109..9118999ed 100644 --- a/slides/_posts/pages/template-data/0001-01-01-using-template-data.md +++ b/slides/_posts/pages/template-data/0001-01-01-using-template-data.md @@ -1,7 +1,7 @@ --- chapter: "Template Data" cover: true -layout: hydesides + tags: - "pages/template-data" --- diff --git a/slides/_posts/pages/template-data/0002-01-01-template-data-example.md b/slides/_posts/pages/template-data/0002-01-01-template-data-example.md index 2d7aff353..65ff01e13 100644 --- a/slides/_posts/pages/template-data/0002-01-01-template-data-example.md +++ b/slides/_posts/pages/template-data/0002-01-01-template-data-example.md @@ -1,7 +1,7 @@ --- chapter: "Template Data" cover: true -layout: hydesides + tags: - "pages/template-data" --- diff --git a/slides/_posts/pages/template-data/0003-01-01-updating-the-template.md b/slides/_posts/pages/template-data/0003-01-01-updating-the-template.md index c88bc1e11..7c776c170 100644 --- a/slides/_posts/pages/template-data/0003-01-01-updating-the-template.md +++ b/slides/_posts/pages/template-data/0003-01-01-updating-the-template.md @@ -1,7 +1,7 @@ --- chapter: "Template Data" cover: true -layout: hydesides + tags: - "pages/template-data" --- @@ -16,4 +16,3 @@ Now, we can go back to update our page layout in `_layouts/page.html` to add a p

Hello World!

- diff --git a/slides/_posts/pages/template-data/0004-01-01-lets-take-a-look-part-deux.md b/slides/_posts/pages/template-data/0004-01-01-lets-take-a-look-part-deux.md index 81ea9e0fc..1a65e184c 100644 --- a/slides/_posts/pages/template-data/0004-01-01-lets-take-a-look-part-deux.md +++ b/slides/_posts/pages/template-data/0004-01-01-lets-take-a-look-part-deux.md @@ -1,7 +1,7 @@ --- chapter: "Template Data" cover: true -layout: hydesides + title: Let's Take A Look Part Deux tags: - "pages/template-data" 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'] ----