Outline.md

- Intro

- Getting Started

- Power Tips / Workflows

Part 0
"To there and back again"

• Title / introduction

Part 1
"The Council of Elrond" (Part 2?)

• History of git
• Design goals
• All systems

Part 2
"A Conspiracy Unmasked" (Part 1?)

• how it works
• Three states
• basic work flow, modify, stage, commit
• independent, no server needed

Part 3
"The White Rider"

• What a branch is
• SVN vs. Git model of branching
• HEAD

Part 4
"The Taming of Smeagol"

• Cloning projects

• ex: clone remote project locally

• ex 1: basic:

  • add,
  • modify,
  • stage,
  • commit

• ex 2: branching:

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

• ex 3: undoing things

• checkout

• reset

• rebase

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

Part 5
Playing nice with others "The Muster of Rohan"

• ex 4: remotes

  • adding
  • pull
  • fetch
  • rebase

• 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"

• protocols
• tools
  • Gitweb: http://progit.org/book/ch4-6.html
  • Gitosis: http://progit.org/book/ch4-7.html
  • Gitolite: http://progit.org/book/ch4-8.html
• hosted services

Part N:

• My contact info
• Additional reading
  • "First time setup" config, etc http://progit.org/book/ch1-5.html
• Thanks to Scotta