Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

presentation as given at FISL

  • Loading branch information...
commit 3301875c107d9b6eba64107633590d3debe1965d 0 parents
Scott Chacon authored
Showing with 395 additions and 0 deletions.
  1. +6 −0 README
  2. BIN  about_me/.DS_Store
  3. +49 −0 about_me/about_me.md
  4. BIN  about_me/github-stuff.png
  5. BIN  about_me/github.png
  6. BIN  about_me/gitscm.png
  7. BIN  about_me/octocat.png
  8. BIN  about_me/peepcode.png
  9. BIN  about_me/progit.png
  10. +8 −0 extra.css
  11. +14 −0 final/final.md
  12. +168 −0 git/0_intro.md
  13. +134 −0 git/git.md
  14. BIN  git/stuff/stuff.013.jpg
  15. BIN  git/stuff/stuff.014.jpg
  16. BIN  git/stuff/stuff.015.jpg
  17. BIN  git/stuff/stuff.016.jpg
  18. BIN  git/stuff/stuff.017.jpg
  19. BIN  git/stuff/stuff.018.jpg
  20. BIN  git/stuff/stuff.019.jpg
  21. BIN  git/stuff/stuff.020.jpg
  22. BIN  git/stuff/stuff.021.jpg
  23. BIN  git/stuff/stuff.022.jpg
  24. BIN  git/stuff/stuff.023.jpg
  25. BIN  git/stuff/stuff.024.jpg
  26. BIN  git/stuff/stuff.025.jpg
  27. BIN  git/stuff/stuff.026.jpg
  28. BIN  git/stuff/stuff.027.jpg
  29. BIN  git/stuff/stuff.028.jpg
  30. BIN  git/stuff/stuff.029.jpg
  31. BIN  git/stuff/stuff.030.jpg
  32. BIN  git/stuff/stuff.031.jpg
  33. BIN  git/stuff/stuff.032.jpg
  34. BIN  git/stuff/stuff.033.jpg
  35. BIN  git/stuff/stuff.034.jpg
  36. BIN  git/stuff/stuff.035.jpg
  37. BIN  git/stuff/stuff.036.jpg
  38. BIN  git/stuff/stuff.037.jpg
  39. BIN  git/stuff/stuff.038.jpg
  40. BIN  git/stuff/stuff.039.jpg
  41. BIN  git/stuff/stuff.040.jpg
  42. BIN  git/stuff/stuff.041.jpg
  43. BIN  git/stuff/stuff.042.jpg
  44. BIN  git/stuff/stuff.043.jpg
  45. BIN  git/stuff/stuff.044.jpg
  46. BIN  git/stuff/stuff.045.jpg
  47. BIN  git/stuff/stuff.046.jpg
  48. BIN  git/stuff/stuff.047.jpg
  49. BIN  git/stuff/stuff.048.jpg
  50. BIN  git/stuff/stuff.049.jpg
  51. BIN  git/stuff/stuff.050.jpg
  52. BIN  git/stuff/stuff.051.jpg
  53. BIN  git/stuff/stuff.052.jpg
  54. BIN  git/stuff/stuff.053.jpg
  55. BIN  git/stuff/stuff.054.jpg
  56. BIN  git/stuff/stuff.055.jpg
  57. BIN  git/stuff/stuff.056.jpg
  58. BIN  git/stuff/stuff.057.jpg
  59. BIN  git/stuff/stuff.058.jpg
  60. BIN  git/stuff/stuff.059.jpg
  61. BIN  git/stuff/stuff.060.jpg
  62. BIN  git/stuff/stuff.061.jpg
  63. BIN  git/stuff/stuff.062.jpg
  64. BIN  git/stuff/stuff.063.jpg
  65. BIN  git/stuff/stuff.064.jpg
  66. BIN  git/stuff/stuff.065.jpg
  67. BIN  git/stuff/stuff.066.jpg
  68. BIN  git/stuff/stuff.067.jpg
  69. BIN  git/stuff/stuff.068.jpg
  70. BIN  git/stuff/stuff.069.jpg
  71. +7 −0 showoff.json
  72. +9 −0 title/title.md
6 README
@@ -0,0 +1,6 @@
+init/clone
+snapshotting
+branching / merging
+sharing (fetch/push)
+branch inspect / compare
+
BIN  about_me/.DS_Store
Binary file not shown
49 about_me/about_me.md
@@ -0,0 +1,49 @@
+!SLIDE
+
+# Me #
+
+!SLIDE
+
+# Scott Anthony Chacon #
+
+!SLIDE center
+
+![Octocat](octocat.png)
+
+![GitHub](github.png)
+
+!SLIDE center
+
+## github.com/**schacon** ##
+
+![GitHub Stuff](github-stuff.png)
+
+!SLIDE center
+
+## http://git-scm.com ##
+
+![git-scm.com](gitscm.png)
+
+!SLIDE center
+
+![peepcode](peepcode.png)
+
+!SLIDE center
+
+![Pro Git](progit.png)
+
+## http://progit.org ##
+
+!SLIDE
+
+# @chacon #
+
+!SLIDE
+
+# schacon@gmail.com #
+
+!SLIDE center
+
+# </me> #
+
+
BIN  about_me/github-stuff.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  about_me/github.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  about_me/gitscm.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  about_me/octocat.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  about_me/peepcode.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  about_me/progit.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 extra.css
@@ -0,0 +1,8 @@
+.powercmd {
+ font-family: monospace;
+ background: #922;
+ padding-top: 200px;
+ color: #fff;
+ height: 100%;
+ font-size: 1.9em;
+}
14 final/final.md
@@ -0,0 +1,14 @@
+!SLIDE
+
+# that's it!
+
+!SLIDE bullets incremental small
+
+# Resources #
+
+* git-scm.com
+* gitref.org
+* progit.org
+* \#git / \#github on IRC
+* schacon@gmail.com
+
168 git/0_intro.md
@@ -0,0 +1,168 @@
+!SLIDE center
+![](stuff/stuff.013.jpg)
+
+!SLIDE center
+![](stuff/stuff.014.jpg)
+
+!SLIDE center
+![](stuff/stuff.015.jpg)
+
+!SLIDE center
+![](stuff/stuff.016.jpg)
+
+!SLIDE center
+![](stuff/stuff.017.jpg)
+
+!SLIDE center
+![](stuff/stuff.018.jpg)
+
+!SLIDE center
+![](stuff/stuff.019.jpg)
+
+!SLIDE center
+![](stuff/stuff.020.jpg)
+
+!SLIDE center
+![](stuff/stuff.021.jpg)
+
+!SLIDE center
+![](stuff/stuff.022.jpg)
+
+!SLIDE center
+![](stuff/stuff.024.jpg)
+
+!SLIDE center
+![](stuff/stuff.025.jpg)
+
+!SLIDE center
+![](stuff/stuff.026.jpg)
+
+!SLIDE center
+![](stuff/stuff.027.jpg)
+
+!SLIDE center
+![](stuff/stuff.028.jpg)
+
+!SLIDE center
+![](stuff/stuff.029.jpg)
+
+!SLIDE center
+![](stuff/stuff.030.jpg)
+
+!SLIDE center
+![](stuff/stuff.031.jpg)
+
+!SLIDE center
+![](stuff/stuff.032.jpg)
+
+!SLIDE center
+![](stuff/stuff.033.jpg)
+
+!SLIDE center
+![](stuff/stuff.034.jpg)
+
+!SLIDE center
+![](stuff/stuff.035.jpg)
+
+!SLIDE center
+![](stuff/stuff.036.jpg)
+
+!SLIDE center
+![](stuff/stuff.037.jpg)
+
+!SLIDE center
+![](stuff/stuff.038.jpg)
+
+!SLIDE center
+![](stuff/stuff.039.jpg)
+
+!SLIDE center
+![](stuff/stuff.040.jpg)
+
+!SLIDE center
+![](stuff/stuff.041.jpg)
+
+!SLIDE center
+![](stuff/stuff.042.jpg)
+
+!SLIDE center
+![](stuff/stuff.043.jpg)
+
+!SLIDE center
+![](stuff/stuff.044.jpg)
+
+!SLIDE center
+![](stuff/stuff.045.jpg)
+
+!SLIDE center
+![](stuff/stuff.046.jpg)
+
+!SLIDE center
+![](stuff/stuff.047.jpg)
+
+!SLIDE center
+![](stuff/stuff.048.jpg)
+
+!SLIDE center
+![](stuff/stuff.049.jpg)
+
+!SLIDE center
+![](stuff/stuff.050.jpg)
+
+!SLIDE center
+![](stuff/stuff.051.jpg)
+
+!SLIDE center
+![](stuff/stuff.052.jpg)
+
+!SLIDE center
+![](stuff/stuff.053.jpg)
+
+!SLIDE center
+![](stuff/stuff.054.jpg)
+
+!SLIDE center
+![](stuff/stuff.055.jpg)
+
+!SLIDE center
+![](stuff/stuff.056.jpg)
+
+!SLIDE center
+![](stuff/stuff.057.jpg)
+
+!SLIDE center
+![](stuff/stuff.058.jpg)
+
+!SLIDE center
+![](stuff/stuff.059.jpg)
+
+!SLIDE center
+![](stuff/stuff.060.jpg)
+
+!SLIDE center
+![](stuff/stuff.061.jpg)
+
+!SLIDE center
+![](stuff/stuff.062.jpg)
+
+!SLIDE center
+![](stuff/stuff.063.jpg)
+
+!SLIDE center
+![](stuff/stuff.064.jpg)
+
+!SLIDE center
+![](stuff/stuff.065.jpg)
+
+!SLIDE center
+![](stuff/stuff.066.jpg)
+
+!SLIDE center
+![](stuff/stuff.067.jpg)
+
+!SLIDE center
+![](stuff/stuff.068.jpg)
+
+!SLIDE center
+![](stuff/stuff.069.jpg)
+
134 git/git.md
@@ -0,0 +1,134 @@
+ !SLIDE
+# Getting Git #
+
+!SLIDE
+# how do you get a git repository? #
+
+!SLIDE powercmd
+# git clone #
+
+!SLIDE
+# but even simpler... #
+
+!SLIDE
+# who has used RCS? #
+
+!SLIDE powercmd
+# git init #
+
+
+!SLIDE
+# Snapshotting #
+
+!SLIDE
+# creating your snapshots #
+
+!SLIDE
+# 1. staging your content #
+
+!SLIDE powercmd
+# git add #
+
+!SLIDE
+# 2. seeing what is staged #
+
+!SLIDE powercmd
+# git status #
+
+!SLIDE powercmd
+# git diff #
+
+!SLIDE
+# 3. recording the staged content #
+
+!SLIDE powercmd
+# git commit #
+
+!SLIDE
+# even simpler way #
+
+!SLIDE powercmd
+# git commit -a #
+
+
+!SLIDE
+# Branching #
+
+!SLIDE
+# contexts to isolate your work in #
+
+!SLIDE
+# 1. create a new context #
+
+!SLIDE powercmd
+# git branch #
+
+!SLIDE
+# 2. switch to another context #
+
+!SLIDE powercmd
+# git checkout #
+
+!SLIDE
+# 1,2. create and switch at the same time #
+
+!SLIDE powercmd
+# git checkout -b #
+
+
+!SLIDE
+# Merging #
+
+!SLIDE
+# combine two or more contexts #
+
+!SLIDE powercmd
+# git merge #
+
+
+!SLIDE
+# Sharing #
+
+!SLIDE
+# telling Git about another repository #
+
+!SLIDE powercmd
+# git remote #
+
+!SLIDE
+# updating a branch in another repository with one of yours #
+
+!SLIDE powercmd
+# git push #
+
+!SLIDE
+# getting all the branches in another repository #
+
+!SLIDE powercmd
+# git fetch #
+
+
+!SLIDE
+# Overview #
+
+!SLIDE
+# 12 Commands #
+
+!SLIDE bullets incremental code small
+
+* git init
+* git clone
+* git add
+* git status
+* git diff
+* git commit
+
+!SLIDE bullets incremental code small
+
+* git branch
+* git checkout
+* git merge
+* git remote
+* git push
+* git fetch
+
BIN  git/stuff/stuff.013.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.014.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.015.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.016.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.017.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.018.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.019.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.020.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.021.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.022.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.023.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.024.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.025.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.026.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.027.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.028.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.029.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.030.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.031.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  git/stuff/stuff.032.jpg
Diff not rendered
BIN  git/stuff/stuff.033.jpg
Diff not rendered
BIN  git/stuff/stuff.034.jpg
Diff not rendered
BIN  git/stuff/stuff.035.jpg
Diff not rendered
BIN  git/stuff/stuff.036.jpg
Diff not rendered
BIN  git/stuff/stuff.037.jpg
Diff not rendered
BIN  git/stuff/stuff.038.jpg
Diff not rendered
BIN  git/stuff/stuff.039.jpg
Diff not rendered
BIN  git/stuff/stuff.040.jpg
Diff not rendered
BIN  git/stuff/stuff.041.jpg
Diff not rendered
BIN  git/stuff/stuff.042.jpg
Diff not rendered
BIN  git/stuff/stuff.043.jpg
Diff not rendered
BIN  git/stuff/stuff.044.jpg
Diff not rendered
BIN  git/stuff/stuff.045.jpg
Diff not rendered
BIN  git/stuff/stuff.046.jpg
Diff not rendered
BIN  git/stuff/stuff.047.jpg
Diff not rendered
BIN  git/stuff/stuff.048.jpg
Diff not rendered
BIN  git/stuff/stuff.049.jpg
Diff not rendered
BIN  git/stuff/stuff.050.jpg
Diff not rendered
BIN  git/stuff/stuff.051.jpg
Diff not rendered
BIN  git/stuff/stuff.052.jpg
Diff not rendered
BIN  git/stuff/stuff.053.jpg
Diff not rendered
BIN  git/stuff/stuff.054.jpg
Diff not rendered
BIN  git/stuff/stuff.055.jpg
Diff not rendered
BIN  git/stuff/stuff.056.jpg
Diff not rendered
BIN  git/stuff/stuff.057.jpg
Diff not rendered
BIN  git/stuff/stuff.058.jpg
Diff not rendered
BIN  git/stuff/stuff.059.jpg
Diff not rendered
BIN  git/stuff/stuff.060.jpg
Diff not rendered
BIN  git/stuff/stuff.061.jpg
Diff not rendered
BIN  git/stuff/stuff.062.jpg
Diff not rendered
BIN  git/stuff/stuff.063.jpg
Diff not rendered
BIN  git/stuff/stuff.064.jpg
Diff not rendered
BIN  git/stuff/stuff.065.jpg
Diff not rendered
BIN  git/stuff/stuff.066.jpg
Diff not rendered
BIN  git/stuff/stuff.067.jpg
Diff not rendered
BIN  git/stuff/stuff.068.jpg
Diff not rendered
BIN  git/stuff/stuff.069.jpg
Diff not rendered
7 showoff.json
@@ -0,0 +1,7 @@
+{ "name": "My Preso",
+ "sections": [
+ {"section":"title"},
+ {"section":"about_me"},
+ {"section":"git"},
+ {"section":"final"}
+ ]}
9 title/title.md
@@ -0,0 +1,9 @@
+!SLIDE
+
+# Git Crash Course #
+
+## A Quick Tour Through Git ##
+
+### by Scott Chacon ###
+
+
Please sign in to comment.
Something went wrong with that request. Please try again.