initial import

schacon · Mar 30, 2011 · fd4346a · fd4346a
commit fd4346a
Show file tree

Hide file tree

Showing 19 changed files with 206 additions and 0 deletions.
diff --git a/README.txt b/README.txt
@@ -0,0 +1,25 @@
+A Tale of Three Trees
+=====================
+
+* Introduction
+  - about scott
+  - how git works, what is a tree
+
+* The Three Trees
+  - HEAD, index, working dir
+  - the workflow
+  - what they look like at different statuses
+
+* Working with your Trees
+  - reset
+  - checkout
+  - read-tree/write-tree
+  - ls-tree
+
+* Fun with Trees
+  - writing docs to a gh-pages branch without switching branches
+  - making tarballs of project subsets
+
+* Conclusion
+  - know your trees
+  - resources, questions
diff --git a/custom.css b/custom.css
@@ -0,0 +1,61 @@
+.slide {
+  background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#CEEAF9));
+  font-family:"Avenir LT Std", Times, sans-serif;
+  color: #014d65;
+  font-size: 1.3em;
+}
+
+.bigcode pre code { font-size: 1.3em; }
+
+.blockimg img {
+  border: 20px solid #014d65;
+}
+
+.title img { }
+
+h1 {
+  font-weight: bold;
+}
+
+.title h1 {
+  font-weight: bolder;
+  font-size: 160px;
+  color: #014d65;
+  margin-top: 40px;
+  margin-bottom: 30px;
+  letter-spacing:-6px;
+  line-height: 100px;
+}
+
+.title h2 {
+  font-weight: bold;
+  font-size: 95px;
+  color: #0b98b4;
+  margin-bottom: 30px;
+}
+.title h3 {
+  font-weight: lighter;
+  font-size: 50px;
+  color: #0b98b4;
+  border-bottom: 40px;
+}
+
+.subsec h1 {
+  font-weight: bolder;
+  font-size: 160px;
+  color: #014d65;
+  margin-bottom: 5px;
+  line-height: 100px;
+}
+
+.subsec h2 {
+  font-weight: bold;
+  font-size: 95px;
+  margin-top: 10px;
+  color: #0b98b4;
+}
+.subsec h3 {
+  font-weight: lighter;
+  font-size: 50px;
+  color: #0b98b4;
+}
diff --git a/final/01_final.md b/final/01_final.md
@@ -0,0 +1,5 @@
+!SLIDE subsec
+
+# CODA #
+
+## Back to the roots ##
diff --git a/intro/01_slide.md b/intro/01_slide.md
@@ -0,0 +1,37 @@
+!SLIDE title center
+
+## A TALE OF ##
+
+# THREE TREES #
+
+### a magical afternoon with Scott Chacon ###
+
+![](trees.png)
+
+!SLIDE center blockimg
+
+# About Me #
+
+![](chacon.jpg)
+
+!SLIDE center
+
+![](octocat-logo.png)
+
+!SLIDE bullets
+
+# Git Resources #
+
+* git-scm.com
+* gitref.org
+* progit.org
+
+!SLIDE center
+
+![](twitterbird.png)
+
+# @chacon #
+
+!SLIDE center
+
+# &lt;/me>
diff --git a/intro/02_git.md b/intro/02_git.md
@@ -0,0 +1,49 @@
+!SLIDE subsec
+
+# PREFACE #
+
+## How Git Works ##
+
+!SLIDE
+
+## It's all about the trees, baby ##
+
+!SLIDE center blockimg
+
+![](tree.png)
+
+!SLIDE center title
+
+# TREE IS #
+## files and subtrees ##
+
+!SLIDE title
+
+# EXAMPLE #
+
+!SLIDE bigcode
+
+    $ tree
+    .
+    ├── README
+    ├── Rakefile
+    └── lib
+        └── git.rb
+
+        1 directory, 3 files
+
+!SLIDE center
+
+![](gitobjects.png)
+
+!SLIDE center
+
+![](objects-simple.png)
+
+!SLIDE center
+
+![](commits.png)
+
+!SLIDE center
+
+![](commits-simple.png)
diff --git a/intro/chacon.jpg b/intro/chacon.jpg
diff --git a/intro/commits-simple.png b/intro/commits-simple.png
diff --git a/intro/commits.png b/intro/commits.png
diff --git a/intro/gitobjects.png b/intro/gitobjects.png
diff --git a/intro/objects-simple.png b/intro/objects-simple.png
diff --git a/intro/octocat-logo.png b/intro/octocat-logo.png
diff --git a/intro/tree.png b/intro/tree.png
diff --git a/intro/trees.png b/intro/trees.png
diff --git a/intro/twitterbird.png b/intro/twitterbird.png
diff --git a/showoff.json b/showoff.json
@@ -0,0 +1,9 @@
+{ "name": "A Tale of Three Trees", 
+  "sections": [ 
+    { "section":"intro" },
+    { "section":"threetrees" },
+    { "section":"treework" },
+    { "section":"treefun" },
+    { "section":"final" } 
+  ]
+}
diff --git a/threetrees/01_threetrees.md b/threetrees/01_threetrees.md
@@ -0,0 +1,9 @@
+!SLIDE subsec center
+
+# ACT ONE #
+
+## The Three Trees ##
+
+![](trees.png)
+
+
diff --git a/threetrees/trees.png b/threetrees/trees.png
diff --git a/treefun/01_treefun.md b/treefun/01_treefun.md
@@ -0,0 +1,5 @@
+!SLIDE subsec
+
+# ACT THREE #
+
+## Fun With Your Trees ##
diff --git a/treework/01_treework.md b/treework/01_treework.md
@@ -0,0 +1,6 @@
+!SLIDE subsec center
+
+# ACT TWO #
+
+## Working With Trees ##
+