Skip to content

Commit

Permalink
Reformat Outline doc. Small restructing
Browse files Browse the repository at this point in the history
  • Loading branch information
catsby committed Jan 14, 2011
1 parent 1ab2888 commit 36e045b
Showing 1 changed file with 29 additions and 24 deletions.
53 changes: 29 additions & 24 deletions Outline.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
### - Intro
### - Getting Started
### - Power Tips / Workflows


__Part 0__
_"To there and back again"_

- Title / introduction

__Part 1__
_"The Council of Elrond" (Part 2?)_
_"The Council of Elrond" (Part 2?)_

- [History of git](http://progit.org/book/ch1-2.html)
- Design goals
- All systems

__Part 2__
_"A Conspiracy Unmasked" (Part 1?)_
_"A Conspiracy Unmasked" (Part 1?)_

- [how it works](http://progit.org/book/ch1-3.html )
- Three states
- basic work flow, modify, stage, commit
- independent, no server needed

__Part 3__
_"The White Rider"_

- [What a branch is](http://progit.org/book/ch3-1.html)
- SVN vs. Git model of branching
- HEAD

__Part 4__
_"The Taming of Smeagol"_

- Cloning projects
- ex: clone remote project locally
- ex 1: basic:
Expand All @@ -39,26 +39,26 @@ _"The Taming of Smeagol"_

- ex 2: branching:

* branch,
* merge,
* log --stat, --pretty, --oneline, --graph, --since2.weeks,
* log ..master, log master..
* ignore,
* diff (--cached)
* stash

* branch,
* merge,
* log --stat, --pretty, --oneline, --graph, --since2.weeks,
* log ..master, log master..
* ignore,
* diff (--cached)
* stash

- ex 3: undoing things

- checkout
- reset
- rebase
* checkout
* reset
* rebase

sources:
http://progit.org/book/ch2-4.html
- http://progit.org/book/ch2-4.html

Part 5
Playing nice with others "The Muster of Rohan"
__Part 5__
_"The Muster of Rohan"_

- ex 4: remotes
- adding
- pull
Expand All @@ -67,12 +67,15 @@ Playing nice with others "The Muster of Rohan"

- submodules ? <- maybe lightning talk about subs and subtrees
- Distributed Workflows

sources:

- http://progit.org/book/ch2-5.html
- http://progit.org/book/ch3-5.html

Part 6
On the server "The Steward and the King" or "The Grey Havens"
__Part 6__
_"The Steward and the King"_

- protocols
- tools
- Gitweb: http://progit.org/book/ch4-6.html
Expand All @@ -82,7 +85,9 @@ On the server "The Steward and the King" or "The Grey Havens"



Part N:
__Part N:__
_"The Grey Havens"_

- My contact info
- Additional reading
- "First time setup" config, etc http://progit.org/book/ch1-5.html
Expand Down

0 comments on commit 36e045b

Please sign in to comment.