This document provides an overview of Git and GitHub. It discusses what Git is, how it works by storing content in trees and commits, and its advantages like efficiency and handling non-linear development. It also covers installing and configuring Git, including common settings. Key Git workflows like staging changes and committing are demonstrated. The document explains Git's three-tree model and inspection tools. It emphasizes the importance of branching in Git and how branches are cheap to create. Merging branches is shown to be powerful in Git.

1. Git and GitHub
The unabridged story

2. BUT FIRST A WORD FROM OUR SPONSOR

3. BUT FIRST A WORD FROM OUR SPONSOR

4. BUT FIRST A WORD FROM OUR SPONSOR
HAPPY BIRTHDAY DANA!

5. Git
The stupid content tracker

6. What is Git, really?

7. Intelligence Check

8. Intelligence Check
Subversion is a smart database of file differences

9. Intelligence Check
Subversion is a smart database of file differences
Unfortunately, this makes it quite complex

10. Intelligence Check
Subversion is a smart database of file differences
Unfortunately, this makes it quite complex
Git is pretty stupid

11. Intelligence Check
Subversion is a smart database of file differences
Unfortunately, this makes it quite complex
Git is pretty stupid
Stores trees of content, much like a file system

12. Intelligence Check
Subversion is a smart database of file differences
Unfortunately, this makes it quite complex
Git is pretty stupid
Stores trees of content, much like a file system
A commit creates a new tree reachable by name

13. Intelligence Check
Subversion is a smart database of file differences
Unfortunately, this makes it quite complex
Git is pretty stupid
Stores trees of content, much like a file system
A commit creates a new tree reachable by name
It can change your directory to recreate any tree

14. Git Isn’t Really an SCM

15. Git Isn’t Really an SCM
Git does Source Code Management and

16. Git Isn’t Really an SCM
Git does Source Code Management and
Peer to peer content distribution

17. Git Isn’t Really an SCM
Git does Source Code Management and
Peer to peer content distribution
Document database

18. Git Isn’t Really an SCM
Git does Source Code Management and
Peer to peer content distribution
Document database
Distributed wiki

19. Git Isn’t Really an SCM
Git does Source Code Management and
Peer to peer content distribution
Document database
Distributed wiki
Distributed issue tracker

20. Git Isn’t Really an SCM
Git does Source Code Management and
Peer to peer content distribution
Document database
Distributed wiki
Distributed issue tracker
Backups

21. The Plusses of
a Simple Design

22. The Plusses of
a Simple Design
It was designed to manage the development of the
Linux kernel (a very large code base)

23. The Plusses of
a Simple Design
It was designed to manage the development of the
Linux kernel (a very large code base)
Git is very efficient

24. The Plusses of
a Simple Design
It was designed to manage the development of the
Linux kernel (a very large code base)
Git is very efficient
Git handles non-linear development with grace

25. The Plusses of
a Simple Design
It was designed to manage the development of the
Linux kernel (a very large code base)
Git is very efficient
Git handles non-linear development with grace
Git is distributed from the ground up

29. SOMETIMES YOU HAVE A TOILET IN YOUR YARD

30. SOMETIMES YOU HAVE A TOILET IN YOUR YARD
AND WHO WANTS THAT, REALLY?

31. The Minuses of
the Toolkit Design

32. The Minuses of
the Toolkit Design
Git provides a ton of commands to interact with it

33. The Minuses of
the Toolkit Design
Git provides a ton of commands to interact with it
The “porcelain” commands are the ones you
typically interact with

34. The Minuses of
the Toolkit Design
Git provides a ton of commands to interact with it
The “porcelain” commands are the ones you
typically interact with
The lower-level “plumbing” commands are crazy
powerful, but less user friendly

35. The Minuses of
the Toolkit Design
Git provides a ton of commands to interact with it
The “porcelain” commands are the ones you
typically interact with
The lower-level “plumbing” commands are crazy
powerful, but less user friendly
This can add up to make Git a little intimidating

36. Installing and Configuring

37. IF YOU BUILD IT, THEY WILL COME

38. IF YOU BUILD IT, THEY WILL COME

39. IF YOU BUILD IT, THEY WILL COME
SOMETIMES YOU JUST HAVE TO INSTALL A RIDICULOUS ROBOT

40. OFFICIAL SITE: HTTP://GIT-SCM.COM/
THERE ARE BINARIES FOR SOME PLATFORMS

41. OFFICIAL SITE: HTTP://GIT-SCM.COM/
THERE ARE BINARIES FOR SOME PLATFORMS

42. OFFICIAL SITE: HTTP://GIT-SCM.COM/
THERE ARE BINARIES FOR SOME PLATFORMS

43. THE INSTRUCTIONS I USE TO BUILD ON MAC OS X
THESE SIDESTEP THE DOCUMENTATION AND MACPORTS REQUIREMENTS

44. THE INSTRUCTIONS I USE TO BUILD ON MAC OS X
THESE SIDESTEP THE DOCUMENTATION AND MACPORTS REQUIREMENTS

45. Git is still young and
growing fast (update to 1.7)

46. [user]
name = James Edward Gray II
email = james@graysoftinc.com
[apply]
whitespace = nowarn
[color]
status = auto
branch = auto
interactive = auto
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[gc]
auto = 1
[github]
user = JEG2
token = …
~/.GITCONFIG
THESE ARE SOME VERY HELPFUL GIT INTERFACE SETTINGS

47. [user]
name = James Edward Gray II
email = james@graysoftinc.com
[apply]
whitespace = nowarn
[color]
status = auto
branch = auto
interactive = auto
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[gc]
auto = 1
[github]
user = JEG2
token = …
~/.GITCONFIG
THESE ARE SOME VERY HELPFUL GIT INTERFACE SETTINGS

48. [user]
name = James Edward Gray II
email = james@graysoftinc.com
[apply]
whitespace = nowarn
[color]
status = auto
branch = auto
interactive = auto
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[gc]
auto = 1
[github]
user = JEG2
token = …
~/.GITCONFIG
THESE ARE SOME VERY HELPFUL GIT INTERFACE SETTINGS

49. [user]
name = James Edward Gray II
email = james@graysoftinc.com
[apply]
whitespace = nowarn
[color]
status = auto
branch = auto
interactive = auto
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[gc]
auto = 1
[github]
user = JEG2
token = …
~/.GITCONFIG
THESE ARE SOME VERY HELPFUL GIT INTERFACE SETTINGS

50. set mainfont {Monaco 12}
set textfont {Monaco 12}
set uifont {"Monaco Bold" 12}
set tabstop 8
set findmergefiles 0
set maxgraphpct 50
set maxwidth 16
set cmitmode patch
set wrapcomment none
set showneartags 1
set showlocalchanges 1
set datetimeformat {%Y-%m-%d %H:%M:%S}
set limitdiffs 1
set bgcolor white
set fgcolor black
set colors {green red blue magenta darkgrey brown orange}
set diffcolors {red "#00a000" blue}
set diffcontext 3
set selectbgcolor gray85
set geometry(main) 794x484+5+45
set geometry(topwidth) 790
set geometry(topheight) 150
set geometry(pwsash0) "280 2"
set geometry(pwsash1) "420 2"
set geometry(botwidth) 350
set geometry(botheight) 314
set permviews {}
~/.GITK
THESE SETTINGS CLEAN UP THE INCLUDED GUI

51. # Git
alias g="git status"
alias ga="git add"
alias gaa="git add ."
alias gc="git commit -m"
alias gca="git commit -am"
alias gb="git branch"
alias gbd="git branch -d"
alias gco="git checkout"
alias gcob="git checkout -b"
alias gm="git merge"
alias gr="git rebase"
alias gl="git log"
alias gs="git show"
alias gd="git diff"
alias gbl="git blame"
alias gps="git push"
alias gpl="git pull"
~/.BASHRC
THESE ARE SOME BASH ALIASES I USE

52. # Git
alias g="git status"
alias ga="git add"
alias gaa="git add ."
alias gc="git commit -m"
alias gca="git commit -am"
alias gb="git branch"
alias gbd="git branch -d"
alias gco="git checkout"
alias gcob="git checkout -b"
alias gm="git merge"
alias gr="git rebase"
alias gl="git log"
alias gs="git show"
alias gd="git diff"
alias gbl="git blame"
alias gps="git push"
alias gpl="git pull"
~/.BASHRC
THESE ARE SOME BASH ALIASES I USE

53. # Git
alias g="git status"
alias ga="git add"
alias gaa="git add ."
alias gc="git commit -m"
alias gca="git commit -am"
alias gb="git branch"
alias gbd="git branch -d"
alias gco="git checkout"
alias gcob="git checkout -b"
alias gm="git merge"
alias gr="git rebase"
alias gl="git log"
alias gs="git show"
alias gd="git diff"
alias gbl="git blame"
alias gps="git push"
alias gpl="git pull"
~/.BASHRC
THESE ARE SOME BASH ALIASES I USE

54. Memorize all of That?

55. Memorize all of That?
There’s a new trend to store your “dotfiles” online

56. Memorize all of That?
There’s a new trend to store your “dotfiles” online
This makes it easy to move them

57. Memorize all of That?
There’s a new trend to store your “dotfiles” online
This makes it easy to move them
Plus we can all share

58. Memorize all of That?
There’s a new trend to store your “dotfiles” online
This makes it easy to move them
Plus we can all share
Surprise: A great place to find these is GitHub

59. Memorize all of That?
There’s a new trend to store your “dotfiles” online
This makes it easy to move them
Plus we can all share
Surprise: A great place to find these is GitHub
Mine are at: http://github.com/JEG2/dotfiles

60. Staging and Commits

61. DANA IS SAD

62. DANA IS SAD

63. DANA IS SAD
HER CRAFT ROOM IS TRANSITIONING INTO A NURSERY

64. STAGING A CHANGE, THEN COMMITTING
THIS IS A NORMAL WORKFLOW FOR CHANGES IN GIT

65. GIT STATUS
GIT ADD .
GIT STATUS
GIT COMMIT -M “FIRST COMMIT.”
STAGING A CHANGE, THEN COMMITTING
THIS IS A NORMAL WORKFLOW FOR CHANGES IN GIT

66. GIT STATUS
GIT ADD .
GIT STATUS
GIT COMMIT -M “FIRST COMMIT.”
STAGING A CHANGE, THEN COMMITTING
THIS IS A NORMAL WORKFLOW FOR CHANGES IN GIT

67. GIT STATUS
GIT ADD .
GIT STATUS
GIT COMMIT -M “FIRST COMMIT.”
STAGING A CHANGE, THEN COMMITTING
THIS IS A NORMAL WORKFLOW FOR CHANGES IN GIT

68. GIT STATUS
GIT ADD .
GIT STATUS
GIT COMMIT -M “FIRST COMMIT.”
STAGING A CHANGE, THEN COMMITTING
THIS IS A NORMAL WORKFLOW FOR CHANGES IN GIT

69. GIT STATUS
GIT ADD .
GIT STATUS
GIT COMMIT -M “FIRST COMMIT.”
STAGING A CHANGE, THEN COMMITTING
THIS IS A NORMAL WORKFLOW FOR CHANGES IN GIT

70. GIT DATA IS SHARED BY THREE AREAS
THE REPOSITORY HOLDS ALL POSSIBLE WORKING DIRECTORIES

71. THE WORKING DIRECTORY
GIT DATA IS SHARED BY THREE AREAS
THE REPOSITORY HOLDS ALL POSSIBLE WORKING DIRECTORIES

72. THE INDEX
OR
STAGING AREA
GIT DATA IS SHARED BY THREE AREAS
THE REPOSITORY HOLDS ALL POSSIBLE WORKING DIRECTORIES

73. THE REPOSITORY
GIT DATA IS SHARED BY THREE AREAS
THE REPOSITORY HOLDS ALL POSSIBLE WORKING DIRECTORIES

74. GIT INCLUDES POWERFUL INSPECTION TOOLS
A SHA1 HASH (40 CHARACTERS) IS HOW GIT NAMES EVERYTHING

75. GIT LOG
GIT SHOW 96987
GIT SHOW 5F3F6
GIT BLAME README
GIT INCLUDES POWERFUL INSPECTION TOOLS
A SHA1 HASH (40 CHARACTERS) IS HOW GIT NAMES EVERYTHING

76. GIT LOG
GIT SHOW 96987
GIT SHOW 5F3F6
GIT BLAME README
GIT INCLUDES POWERFUL INSPECTION TOOLS
A SHA1 HASH (40 CHARACTERS) IS HOW GIT NAMES EVERYTHING

77. GIT LOG
GIT SHOW 96987
GIT SHOW 5F3F6
GIT BLAME README
GIT INCLUDES POWERFUL INSPECTION TOOLS
A SHA1 HASH (40 CHARACTERS) IS HOW GIT NAMES EVERYTHING

78. GIT LOG
GIT SHOW 96987
GIT SHOW 5F3F6
GIT BLAME README
GIT INCLUDES POWERFUL INSPECTION TOOLS
A SHA1 HASH (40 CHARACTERS) IS HOW GIT NAMES EVERYTHING

79. GIT LOG
GIT SHOW 96987
GIT SHOW 5F3F6
GIT BLAME README
GIT INCLUDES POWERFUL INSPECTION TOOLS
A SHA1 HASH (40 CHARACTERS) IS HOW GIT NAMES EVERYTHING

80. GIT LOG
GIT SHOW 96987
GIT SHOW 5F3F6
GIT BLAME README
GIT INCLUDES POWERFUL INSPECTION TOOLS
A SHA1 HASH (40 CHARACTERS) IS HOW GIT NAMES EVERYTHING

81. Branching and Merging

82. YOU CAN ADD BRANCHES TO ANYTHING

83. YOU CAN ADD BRANCHES TO ANYTHING

84. YOU CAN ADD BRANCHES TO ANYTHING
A KID, YOUR SOURCE CODE, OR WHATEVER

86. Using Git without branches
is like buying condoms
and not having any sex

87. GIT WAS MADE TO BRANCH, LITERALLY!
WHEN YOU BRANCH, GIT HAS TO WRITE 40 CHARACTERS TO A FILE (SUPER CHEAP)!

88. GIT WAS MADE TO BRANCH, LITERALLY!
WHEN YOU BRANCH, GIT HAS TO WRITE 40 CHARACTERS TO A FILE (SUPER CHEAP)!

89. GIT WAS MADE TO BRANCH, LITERALLY!
WHEN YOU BRANCH, GIT HAS TO WRITE 40 CHARACTERS TO A FILE (SUPER CHEAP)!

90. GIT WAS MADE TO BRANCH, LITERALLY!
WHEN YOU BRANCH, GIT HAS TO WRITE 40 CHARACTERS TO A FILE (SUPER CHEAP)!

91. THE INCLUDED GITK SHOWS BRANCHES
PASS THE --ALL FLAG TO SEE BRANCHES YOU AREN’T CURRENTLY ON

92. THE INCLUDED GITK SHOWS BRANCHES
PASS THE --ALL FLAG TO SEE BRANCHES YOU AREN’T CURRENTLY ON

93. GIT MERGE PULLS THE NAMED BRANCH IN
UNLIKE SUBVERSION, GIT MERGE IS POWERFUL, SMART, AND EASY TO USE

94. GIT MERGE PULLS THE NAMED BRANCH IN
UNLIKE SUBVERSION, GIT MERGE IS POWERFUL, SMART, AND EASY TO USE

95. GIT MERGE PULLS THE NAMED BRANCH IN
UNLIKE SUBVERSION, GIT MERGE IS POWERFUL, SMART, AND EASY TO USE

96. GIT MERGE PULLS THE NAMED BRANCH IN
UNLIKE SUBVERSION, GIT MERGE IS POWERFUL, SMART, AND EASY TO USE

97. THE HISTORY SHOWS THE INCORPORATED BRANCH
EVEN AFTER THE BRANCH IS DELETED, GIT REMEMBERS WHERE IT CAME FROM

98. THE HISTORY SHOWS THE INCORPORATED BRANCH
EVEN AFTER THE BRANCH IS DELETED, GIT REMEMBERS WHERE IT CAME FROM

99. THE HISTORY SHOWS THE INCORPORATED BRANCH
EVEN AFTER THE BRANCH IS DELETED, GIT REMEMBERS WHERE IT CAME FROM

100. THE HISTORY SHOWS THE INCORPORATED BRANCH
EVEN AFTER THE BRANCH IS DELETED, GIT REMEMBERS WHERE IT CAME FROM

101. REBASE CAN BE USED TO FLATTEN THE HISTORY
YOU CAN CHOOSE TO ADD A BRANCH ONTO THE END OF ANOTHER BRANCH

102. REBASE CAN BE USED TO FLATTEN THE HISTORY
YOU CAN CHOOSE TO ADD A BRANCH ONTO THE END OF ANOTHER BRANCH

103. REBASE CAN BE USED TO FLATTEN THE HISTORY
YOU CAN CHOOSE TO ADD A BRANCH ONTO THE END OF ANOTHER BRANCH

104. NOW THE MERGED HISTORY IS JUST A FLAT LINE
GIT REPLAYED OUR CHANGES ONTO THE END OF THE MASTER BRANCH

106. With Git, it’s never too late
to branch!

107. YOU CAN STILL BRANCH AFTER CHANGES
IF A PROBLEM STARTS TO LOOK BIG AFTER WORKING ON IT, MOVE IT INTO A BRANCH

108. YOU CAN STILL BRANCH AFTER CHANGES
IF A PROBLEM STARTS TO LOOK BIG AFTER WORKING ON IT, MOVE IT INTO A BRANCH

109. GIT STASH CAN HOLDS SOME CHANGES FOR LATER
I USE THIS WHEN I GET INTERRUPTED AND NEED TO SWITCH GEARS

110. GIT STASH CAN HOLDS SOME CHANGES FOR LATER
I USE THIS WHEN I GET INTERRUPTED AND NEED TO SWITCH GEARS

111. GIT STASH CAN HOLDS SOME CHANGES FOR LATER
I USE THIS WHEN I GET INTERRUPTED AND NEED TO SWITCH GEARS

112. Editing History

113. DANA REVISED HER OWN HISTORY

114. DANA REVISED HER OWN HISTORY

115. DANA REVISED HER OWN HISTORY

116. DANA REVISED HER OWN HISTORY
SHE THREW OUT ABOUT 60 COMMITS… ERR, POUNDS

117. Git Trusts you With
the Scary Power Tools

118. Git Trusts you With
the Scary Power Tools
Several Git commands can be used to revise the
commit history

119. Git Trusts you With
the Scary Power Tools
Several Git commands can be used to revise the
commit history
Total rewrites are possible

120. Git Trusts you With
the Scary Power Tools
Several Git commands can be used to revise the
commit history
Total rewrites are possible
Some consider this very evil

121. Git Trusts you With
the Scary Power Tools
Several Git commands can be used to revise the
commit history
Total rewrites are possible
Some consider this very evil
Let me show you two lighter uses that I consider
practical

122. YOU CAN AMEND (OR ADD TO) A COMMIT
THIS IS AWESOME PERFECT FOR WHEN YOU FORGET TO ADD A FILE

123. YOU CAN AMEND (OR ADD TO) A COMMIT
THIS IS AWESOME PERFECT FOR WHEN YOU FORGET TO ADD A FILE

124. YOU GET A CHANCE TO REVISE THE MESSAGE
AS YOU CAN SEE, I HAVE TEXTMATE SET AS MY EDITOR

125. THE TWO COMMITS BECAME ONE
NOTICE HOW ALL ASPECTS OF THE SECOND COMMIT WERE ROLLED INTO THE FIRST

126. THE TWO COMMITS BECAME ONE
NOTICE HOW ALL ASPECTS OF THE SECOND COMMIT WERE ROLLED INTO THE FIRST

127. GIT CAN “CHERRY PICK” COMMITS
YOU AREN’T REQUIRED TO TAKE COMMITS IN ORDER

128. GIT CAN “CHERRY PICK” COMMITS
YOU AREN’T REQUIRED TO TAKE COMMITS IN ORDER

129. GIT CAN “CHERRY PICK” COMMITS
YOU AREN’T REQUIRED TO TAKE COMMITS IN ORDER

130. Git Speaks Subversion

131. WHEELCHAIRS CAN RIDE JAPAN’S TRAINS

132. WHEELCHAIRS CAN RIDE JAPAN’S TRAINS

133. WHEELCHAIRS CAN RIDE JAPAN’S TRAINS
BE SURE YOU SPEAK A LITTLE JAPANESE THOUGH, JUST IN CASE!

134. Git Ships With
Subversion Support

135. Git Ships With
Subversion Support
Checkout with: git svn clone SUBVERSION_URL

136. Git Ships With
Subversion Support
Checkout with: git svn clone SUBVERSION_URL
Add --username=USER if needed

137. Git Ships With
Subversion Support
Checkout with: git svn clone SUBVERSION_URL
Add --username=USER if needed
Update with: git svn rebase

138. Git Ships With
Subversion Support
Checkout with: git svn clone SUBVERSION_URL
Add --username=USER if needed
Update with: git svn rebase
Subversion requires a linear history, thus rebase

139. Git Ships With
Subversion Support
Checkout with: git svn clone SUBVERSION_URL
Add --username=USER if needed
Update with: git svn rebase
Subversion requires a linear history, thus rebase
Use Git to develop locally as normal

140. Git Ships With
Subversion Support
Checkout with: git svn clone SUBVERSION_URL
Add --username=USER if needed
Update with: git svn rebase
Subversion requires a linear history, thus rebase
Use Git to develop locally as normal
Commit all diffs to Subversion: git svn dcommit

141. Distributed Repositories

142. YOU CAN NEVER HAVE TOO FEW GEEKS

143. YOU CAN NEVER HAVE TOO FEW GEEKS

144. YOU CAN NEVER HAVE TOO FEW GEEKS
I NEED THIS MANY JUST TO PLAY A GAME ONCE A YEAR

146. git clone
git://192.168.0.109/faster_csv

147. To Set That Up…

148. To Set That Up…
I created a git_server directory on my Desktop

149. To Set That Up…
I created a git_server directory on my Desktop
I moved my faster_csv repository into it

150. To Set That Up…
I created a git_server directory on my Desktop
I moved my faster_csv repository into it
I ran: git daemon --base-path=/Users/james/
Desktop/git_server --export-all

151. To Set That Up…
I created a git_server directory on my Desktop
I moved my faster_csv repository into it
I ran: git daemon --base-path=/Users/james/
Desktop/git_server --export-all
This is read-only (but write support is possible)
access on port 9418

152. To Set That Up…
I created a git_server directory on my Desktop
I moved my faster_csv repository into it
I ran: git daemon --base-path=/Users/james/
Desktop/git_server --export-all
This is read-only (but write support is possible)
access on port 9418
This rocks for when GitHub is down

154. http://192.168.0.109:1234/

155. An Instant
Web Interface

156. An Instant
Web Interface
I moved into the Git working directory

157. An Instant
Web Interface
I moved into the Git working directory
I ran: git instaweb --httpd=webrick

158. An Instant
Web Interface
I moved into the Git working directory
I ran: git instaweb --httpd=webrick
Later, I will stop it with: git instaweb --stop

159. An Instant
Web Interface
I moved into the Git working directory
I ran: git instaweb --httpd=webrick
Later, I will stop it with: git instaweb --stop
This is a handy poor man’s repository browser
that’s pretty much always available

160. Git Strategies

161. EVERYBODY HAS THEIR SYSTEM

162. EVERYBODY HAS THEIR SYSTEM

163. EVERYBODY HAS THEIR SYSTEM

164. EVERYBODY HAS THEIR SYSTEM

165. EVERYBODY HAS THEIR SYSTEM

166. EVERYBODY HAS THEIR SYSTEM
DANA HAS ONE JUST FOR FOOD

167. Git Supports
Many Work Styles

168. Git Supports
Many Work Styles
Git’s features make it very flexible

169. Git Supports
Many Work Styles
Git’s features make it very flexible
Non-linear history is fully supported

170. Git Supports
Many Work Styles
Git’s features make it very flexible
Non-linear history is fully supported
Powerful history rewriting is provided

171. Git Supports
Many Work Styles
Git’s features make it very flexible
Non-linear history is fully supported
Powerful history rewriting is provided
All repositories are masters

172. Git Supports
Many Work Styles
Git’s features make it very flexible
Non-linear history is fully supported
Powerful history rewriting is provided
All repositories are masters
Any repository can be distributed

173. Git Supports
Many Work Styles
Git’s features make it very flexible
Non-linear history is fully supported
Powerful history rewriting is provided
All repositories are masters
Any repository can be distributed
Many work strategies are built off of these features

174. Branch Strategies

175. SAY WE HAVE A BRANCH WITH TWO COMMITS
THIS IS A PRETTY TYPICAL GIT SCENARIO, A TOPIC BRANCH OFF OF MASTER

176. FAST FORWARD (A FLAT MERGE)
BY DEFAULT, GIT WOULD JUST ADD THESE COMMITS ONTO MASTER

177. YOU CAN FORCE GIT TO KEEP THE BRANCH
HTTP://NVIE.COM/GIT-MODEL

178. YOU CAN FORCE GIT TO KEEP THE BRANCH
HTTP://NVIE.COM/GIT-MODEL

179. NOTICE HOW GIT ADDED A MERGE COMMIT
YOU CAN REVERT THAT ONE COMMIT TO UNDO THE ENTIRE BRANCH

180. NOTICE HOW GIT ADDED A MERGE COMMIT
YOU CAN REVERT THAT ONE COMMIT TO UNDO THE ENTIRE BRANCH

181. ALTERNATELY, YOU COULD SQUASH THE COMMITS
HTTP://GEEWAX.ORG/2009/11/21/AGILE-GIT-WORKFLOW.HTML

182. ALTERNATELY, YOU COULD SQUASH THE COMMITS
HTTP://GEEWAX.ORG/2009/11/21/AGILE-GIT-WORKFLOW.HTML

183. REBASE ASKS ME HOW TO HANDLE EACH COMMIT
GIT COMMANDS LIKE ADD AND REBASE SUPPORT A POWERFUL INTERACTIVE MODE

184. REBASE ASKS ME HOW TO HANDLE EACH COMMIT
GIT COMMANDS LIKE ADD AND REBASE SUPPORT A POWERFUL INTERACTIVE MODE

185. YOU EVEN GET TO REVISE THE COMMITS
COMBINE OR REPLACE THEM TO TASTE

186. YOU EVEN GET TO REVISE THE COMMITS
COMBINE OR REPLACE THEM TO TASTE

187. FINALLY, MERGE THE COLLAPSED COMMIT
I CAN USE THE POWER OF INTERACTIVE MODE TO COLLAPSE THINGS INTO ONE COMMIT

188. FINALLY, MERGE THE COLLAPSED COMMIT
I CAN USE THE POWER OF INTERACTIVE MODE TO COLLAPSE THINGS INTO ONE COMMIT

189. A TOPIC BRANCH WAS REDUCED TO ONE COMMIT
THIS IS ANOTHER TECHNIQUE THAT ALLOWS US TO UNDO IT WITH ONE REVERT

190. A TOPIC BRANCH WAS REDUCED TO ONE COMMIT
THIS IS ANOTHER TECHNIQUE THAT ALLOWS US TO UNDO IT WITH ONE REVERT

191. Master Repository
Strategies

192. YOUR SUBVERSION STRATEGY STILL WORKS FINE
THIS IS HOW GITHUB IS COMMONLY USED

193. LINUS USES HIS “CIRCLE OF TRUST”
HTTP://WWW.YOUTUBE.COM/WATCH?V=4XPNKHJAOK8

194. LINUS USES HIS “CIRCLE OF TRUST”
HTTP://WWW.YOUTUBE.COM/WATCH?V=4XPNKHJAOK8

195. LINUS USES HIS “CIRCLE OF TRUST”
HTTP://WWW.YOUTUBE.COM/WATCH?V=4XPNKHJAOK8

196. GitHub
https://github.com/
Social coding with Git

198. GitHub is one of
Git’s Killer Features

201. THIS IS CALLED “FORKING”

202. THIS IS CALLED “FORKING”
DANA IS SPINNING OFF OF A COPY OF GENES WE WILL EDIT SEPARATELY

203. “Hardcore Forking Action”

204. CREATING A GITHUB REPOSITORY IS TRIVIAL
PUBLIC, OPEN SOURCE REPOSITORIES ARE FREE!

205. CREATING A GITHUB REPOSITORY IS TRIVIAL
PUBLIC, OPEN SOURCE REPOSITORIES ARE FREE!

206. A REPOSITORY ON GITHUB: THE RAILS SOURCE
HERE YOU CAN BROWSE OR FORK THE CODE

207. A REPOSITORY ON GITHUB: THE RAILS SOURCE
HERE YOU CAN BROWSE OR FORK THE CODE

208. A REPOSITORY ON GITHUB: THE RAILS SOURCE
HERE YOU CAN BROWSE OR FORK THE CODE

209. A REPOSITORY ON GITHUB: THE RAILS SOURCE
HERE YOU CAN BROWSE OR FORK THE CODE

210. A REPOSITORY ON GITHUB: THE RAILS SOURCE
HERE YOU CAN BROWSE OR FORK THE CODE

211. A FORKED REPOSITORY: RIOT
THIS FORK IS LINKED BACK TO THE ORIGINAL AND THEY CAN PULL FROM IT

212. A FORKED REPOSITORY: RIOT
THIS FORK IS LINKED BACK TO THE ORIGINAL AND THEY CAN PULL FROM IT

213. A FORKED REPOSITORY: RIOT
THIS FORK IS LINKED BACK TO THE ORIGINAL AND THEY CAN PULL FROM IT

214. A FORKED REPOSITORY: RIOT
THIS FORK IS LINKED BACK TO THE ORIGINAL AND THEY CAN PULL FROM IT

215. A FORKED REPOSITORY: RIOT
THIS FORK IS LINKED BACK TO THE ORIGINAL AND THEY CAN PULL FROM IT

216. THE NETWORK GRAPH
THIS IS WHERE YOU CAN SEE HOW ALL OF THE FORKS RELATE

217. THE NETWORK GRAPH
THIS IS WHERE YOU CAN SEE HOW ALL OF THE FORKS RELATE

218. THE NETWORK GRAPH
THIS IS WHERE YOU CAN SEE HOW ALL OF THE FORKS RELATE

219. THE NETWORK GRAPH
THIS IS WHERE YOU CAN SEE HOW ALL OF THE FORKS RELATE

220. THE FORK QUEUE CAN MERGE EXTERNAL CHANGES
I PREFER TO HANDLE THIS REMOTES SO A CAN WORK WITH NORMAL BRANCHES

221. THE FORK QUEUE CAN MERGE EXTERNAL CHANGES
I PREFER TO HANDLE THIS REMOTES SO A CAN WORK WITH NORMAL BRANCHES

222. THE FORK QUEUE CAN MERGE EXTERNAL CHANGES
I PREFER TO HANDLE THIS REMOTES SO A CAN WORK WITH NORMAL BRANCHES

223. MY FORK AND THE OFFICIAL
GIT’S REMOTES CAN MANAGE ANY NUMBER OF RELATED REPOSITORIES

224. MY FORK AND THE OFFICIAL
GIT’S REMOTES CAN MANAGE ANY NUMBER OF RELATED REPOSITORIES

225. MY FORK AND THE OFFICIAL
GIT’S REMOTES CAN MANAGE ANY NUMBER OF RELATED REPOSITORIES

226. MY FORK AND THE OFFICIAL
GIT’S REMOTES CAN MANAGE ANY NUMBER OF RELATED REPOSITORIES

227. FETCHING A REMOTE
GIT FETCH ALLOWS YOU TO ADD ALL DETAILS OF A REMOTE TO YOUR LOCAL COPY

228. FETCHING A REMOTE
GIT FETCH ALLOWS YOU TO ADD ALL DETAILS OF A REMOTE TO YOUR LOCAL COPY

229. PLAY WITH CODE FROM A REMOTE
LOCAL BRANCHES CAN TRACK REMOTE BRANCHES

230. PLAY WITH CODE FROM A REMOTE
LOCAL BRANCHES CAN TRACK REMOTE BRANCHES

231. PLAY WITH CODE FROM A REMOTE
LOCAL BRANCHES CAN TRACK REMOTE BRANCHES

232. FULLY SHARE WITH COLLABORATORS
A COLLABORATOR CAN USE THE CODE LIKE YOU WITHOUT PULL REQUESTS

233. FULLY SHARE WITH COLLABORATORS
A COLLABORATOR CAN USE THE CODE LIKE YOU WITHOUT PULL REQUESTS

234. FULLY SHARE WITH COLLABORATORS
A COLLABORATOR CAN USE THE CODE LIKE YOU WITHOUT PULL REQUESTS

235. Gists

238. OUR NEIGHBOR’S YARD

239. OUR NEIGHBOR’S YARD
SOME THINGS ARE TOO GOOD NOT TO SHARE

240. A GIT-CENTRIC CODE PASTING SERVICE
PASTE ONE OR MORE FILES TAGGED WITH A LANGUAGE

241. A GIT-CENTRIC CODE PASTING SERVICE
PASTE ONE OR MORE FILES TAGGED WITH A LANGUAGE

242. A GIT-CENTRIC CODE PASTING SERVICE
PASTE ONE OR MORE FILES TAGGED WITH A LANGUAGE

243. A GIT-CENTRIC CODE PASTING SERVICE
PASTE ONE OR MORE FILES TAGGED WITH A LANGUAGE

244. IT’S A PASTE AND A GIT REPOSITORY
YOU CAN FORK THIS CODE OR CLONE IT TO WORK WITH LOCALLY

245. IT’S A PASTE AND A GIT REPOSITORY
YOU CAN FORK THIS CODE OR CLONE IT TO WORK WITH LOCALLY

246. Hooks

247. IT’S ALWAYS GOOD TO HAVE TRAINED HELP

248. IT’S ALWAYS GOOD TO HAVE TRAINED HELP

249. IT’S ALWAYS GOOD TO HAVE TRAINED HELP
YOU CAN TEACH GIT AND GITHUB NEW TRICKS

250. GIT HOOKS
THE POST-COMMIT HOOK CAN BE USED TO AUTO TAG RELEASES

251. GIT HOOKS
THE POST-COMMIT HOOK CAN BE USED TO AUTO TAG RELEASES

252. GIT HOOKS
THE POST-COMMIT HOOK CAN BE USED TO AUTO TAG RELEASES

253. GITHUB SUPPORTS HOOKS
POST TO A URL, SEND AN EMAIL, OR MORE WHEN GITHUB IS PUSHED TO

254. GITHUB SUPPORTS HOOKS
POST TO A URL, SEND AN EMAIL, OR MORE WHEN GITHUB IS PUSHED TO

255. GITHUB SUPPORTS HOOKS
POST TO A URL, SEND AN EMAIL, OR MORE WHEN GITHUB IS PUSHED TO

256. GITHUB SUPPORTS HOOKS
POST TO A URL, SEND AN EMAIL, OR MORE WHEN GITHUB IS PUSHED TO

257. README Formatting

258. FIRST IMPRESSIONS MATTER

259. FIRST IMPRESSIONS MATTER

260. FIRST IMPRESSIONS MATTER

261. FIRST IMPRESSIONS MATTER
YOU HAVE TO ADVERTISE WHAT’S INSIDE

262. GITHUB IS SMART ABOUT README FORMATS
IT WILL SHOW README FILES IN EACH FOLDER AND HTMLIFY SOME CONTENT TYPES

263. GITHUB IS SMART ABOUT README FORMATS
IT WILL SHOW README FILES IN EACH FOLDER AND HTMLIFY SOME CONTENT TYPES

264. GITHUB IS SMART ABOUT README FORMATS
IT WILL SHOW README FILES IN EACH FOLDER AND HTMLIFY SOME CONTENT TYPES

265. Supported Formats

266. Supported Formats
RDoc (.rdoc)

267. Supported Formats
RDoc (.rdoc)
Reuse your Ruby project documentation

268. Supported Formats
RDoc (.rdoc)
Reuse your Ruby project documentation
Markdown (.markdown, .md, .mdown, …)

269. Supported Formats
RDoc (.rdoc)
Reuse your Ruby project documentation
Markdown (.markdown, .md, .mdown, …)
A human-readable format for other projects

270. Supported Formats
RDoc (.rdoc)
Reuse your Ruby project documentation
Markdown (.markdown, .md, .mdown, …)
A human-readable format for other projects
Also supported: Textile (.textile), PNG (.png),
reStructuredText (.rst), and POD (.pod)

271. GitHub Pages

272. OUR NEW OK.RB WEBSITE: HTTP://OK-RUBY.ORG/

273. OUR NEW OK.RB WEBSITE: HTTP://OK-RUBY.ORG/

274. OUR NEW OK.RB WEBSITE: HTTP://OK-RUBY.ORG/
YOU CAN HELP MAKE THIS BETTER

275. IT’S A PROJECT ON GITHUB
THE GITHUB PAGES FEATURE TURNS THIS INTO A REAL SITE

276. IT’S A PROJECT ON GITHUB
THE GITHUB PAGES FEATURE TURNS THIS INTO A REAL SITE

277. GitHub Pages

278. GitHub Pages
Name a repository after you: USER.github.com

279. GitHub Pages
Name a repository after you: USER.github.com
Or add a gh-pages branch to any repository

280. GitHub Pages
Name a repository after you: USER.github.com
Or add a gh-pages branch to any repository
GitHub will build the site after each commit

281. GitHub Pages
Name a repository after you: USER.github.com
Or add a gh-pages branch to any repository
GitHub will build the site after each commit
Sites are Jekyll (a static site generator) processed

282. GitHub Pages
Name a repository after you: USER.github.com
Or add a gh-pages branch to any repository
GitHub will build the site after each commit
Sites are Jekyll (a static site generator) processed
Used to build listings, syntax highlight, etc.

283. GitHub Pages
Name a repository after you: USER.github.com
Or add a gh-pages branch to any repository
GitHub will build the site after each commit
Sites are Jekyll (a static site generator) processed
Used to build listings, syntax highlight, etc.
You can point a real domain at them

284. Documentation
Learning more about Git and GitHub

287. IF YOU FELL ASLEEP IN THIS TALK…

288. IF YOU FELL ASLEEP IN THIS TALK…
YOU MAY NEED TO RTFM

289. Where to Find the Docs

290. Where to Find the Docs
Git has awesome man(ual) pages

291. Where to Find the Docs
Git has awesome man(ual) pages
Replace spaces with dashes: man git-stash

292. Where to Find the Docs
Git has awesome man(ual) pages
Replace spaces with dashes: man git-stash
Scott Chacon’s (GitHub’s Git Guru) Pro Git book

293. Where to Find the Docs
Git has awesome man(ual) pages
Replace spaces with dashes: man git-stash
Scott Chacon’s (GitHub’s Git Guru) Pro Git book
Free online: http://progit.org/

294. Where to Find the Docs
Git has awesome man(ual) pages
Replace spaces with dashes: man git-stash
Scott Chacon’s (GitHub’s Git Guru) Pro Git book
Free online: http://progit.org/
GitHub has good guides: http://help.github.com/

295. Where to Find the Docs
Git has awesome man(ual) pages
Replace spaces with dashes: man git-stash
Scott Chacon’s (GitHub’s Git Guru) Pro Git book
Free online: http://progit.org/
GitHub has good guides: http://help.github.com/
They cover GitHub and Git topics

297. You have passed
this endurance test!