Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

initial import

  • Loading branch information...
commit fd4346a87c6b3e1155b6755dc52e74f58e4c878f 0 parents
Scott Chacon authored
25 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
61 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;
+}
5 final/01_final.md
@@ -0,0 +1,5 @@
+!SLIDE subsec
+
+# CODA #
+
+## Back to the roots ##
37 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
+
+# </me>
49 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)
BIN  intro/chacon.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  intro/commits-simple.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  intro/commits.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  intro/gitobjects.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  intro/objects-simple.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  intro/octocat-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  intro/tree.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  intro/trees.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  intro/twitterbird.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 showoff.json
@@ -0,0 +1,9 @@
+{ "name": "A Tale of Three Trees",
+ "sections": [
+ { "section":"intro" },
+ { "section":"threetrees" },
+ { "section":"treework" },
+ { "section":"treefun" },
+ { "section":"final" }
+ ]
+}
9 threetrees/01_threetrees.md
@@ -0,0 +1,9 @@
+!SLIDE subsec center
+
+# ACT ONE #
+
+## The Three Trees ##
+
+![](trees.png)
+
+
BIN  threetrees/trees.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 treefun/01_treefun.md
@@ -0,0 +1,5 @@
+!SLIDE subsec
+
+# ACT THREE #
+
+## Fun With Your Trees ##
6 treework/01_treework.md
@@ -0,0 +1,6 @@
+!SLIDE subsec center
+
+# ACT TWO #
+
+## Working With Trees ##
+
Please sign in to comment.
Something went wrong with that request. Please try again.