-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
0 parents
commit fd4346a
Showing
19 changed files
with
206 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
!SLIDE subsec | ||
|
||
# CODA # | ||
|
||
## Back to the roots ## |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{ "name": "A Tale of Three Trees", | ||
"sections": [ | ||
{ "section":"intro" }, | ||
{ "section":"threetrees" }, | ||
{ "section":"treework" }, | ||
{ "section":"treefun" }, | ||
{ "section":"final" } | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
!SLIDE subsec center | ||
|
||
# ACT ONE # | ||
|
||
## The Three Trees ## | ||
|
||
![](trees.png) | ||
|
||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
!SLIDE subsec | ||
|
||
# ACT THREE # | ||
|
||
## Fun With Your Trees ## |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
!SLIDE subsec center | ||
|
||
# ACT TWO # | ||
|
||
## Working With Trees ## | ||
|