Git Workflow

Transcript

1. Little Red Riding Hood !
2. The Big Bad Ogre Little Red Riding Hood and
3. Travis Douce travis@bignerdranch.com! travisdouce@gmail.com! Twitter: @travisdouce GitHub: tdouce
4. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
5. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
6. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
7. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
8. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
9. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
10. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
11. The Brothers Grimm Wilhelm Jacob
12. What is Git?
13. Create Repo
14. Create Repo
15. Create Repo
16. Create Repo
17. Create Repo
18. Create Repo
19. Create Repo
20. Create Repo
21. Create Repo
22. Create Repo
23. Add Color
24. Add Color
25. Add Color
26. Track File
27. Track File
28. Stage
29. Commit to repo
30. Commit to repo opens editor
31. commit message Commit to repo * See end of slides for writing great commit messages
32. save Commit to repo
33. Commit to repo
34. Commit to repo This means it worked!
35. Commit to repo
36. Commit to repo
37. Commit to repo
38. Let’s write our story
39. little_red_riding_hood.txt Edit File
40. Modified
41. Modified
42. Stage
43. Stage
44. Stage
45. Commit
46. Commit opens editor opens editor save opens editor
47. Commit opens editor opens editor save commit message
48. Commit opens editor opens editor save save
49. Commit
50. Commit
51. Commit
52. Modified Staged Committed Basic Workflow
53. Modified Staged Committed Basic Workflow
54. Modified Staged Committed Basic Workflow
55. Killer opening
56. save file Edit File little_red_riding_hood.txt
57. save file Edit File little_red_riding_hood.txt
58. Modified
59. Modified
60. Stage
61. Stage
62. Stage
63. Commit
64. Commit opens editor
65. Commit commit message
66. Commit save
67. Commit
68. Commit
69. Commit
70. Alias
71. Alias
72. Alias
73. History
74. As a log
75. As a log
76. As a log
77. As a log
78. As a log
79. sha
80. As a detailed log
81. As a detailed log
82. As a detailed log
83. As a detailed log
85. little_red_riding_hood.txt Edit File
86. little_red_riding_hood.txt Edit File
87. Modified
88. Modified
89. Stage
90. Commit
91. opens editor
94. save
95. ALWAYS Verbose Commit
96. My Ugly History
97. As a graph *lg alias at end of slides
98. As a graph *lg alias at end of slides
99. As a graph
100. As a graph
101. As a graph
102. As a graph
103. What is HEAD? Parent of next commit
104. What is master? Default branch
105. What is master? Default branch
106. Re-write history
107. A prettier past
108. A prettier past
109. start rebasing at sha Rebase
110. copy to clipboard Rebase
111. Rebase
112. Rebase interactive
113. Rebase paste sha from clipboard
114. opens editor
122. f
123. f save
124. Rebase
125. Rebase Success!
126. Rebase git rebase --abort
127. History as a graph
128. History as a graph
129. History as a graph
130. Rebase
131. Rebase different sha
132. History with details
133. History with details
134. It worked! History with details
135. Wilhelm Grimm Jealous
136. Wilhelm Grimm Jealous
137. Wilhelm Grimm Jealous
138. Remotes
139. Remotes
140. Create repo on remote (GitHub)
141. copy to clipboard Create repo on remote (GitHub)
142. Add remote (GitHub)
143. Add remote (GitHub) name we gave the remote
144. Add remote (GitHub) paste from clipboard
145. List remotes
146. List remotes
147. Push to remote (GitHub) move code from local to remote
148. name of remote (github) Push to remote (GitHub)
149. name of local branch Push to remote (GitHub)
150. Push to remote (GitHub)
151. Push to remote (GitHub) This means it worked!
152. remote (GitHub) most recent commit
153. Finish story
154. Modified
155. Modified
156. Stage
157. Commit with message Can supply message
158. Commit with message
159. Commit with message
160. Commit with message
161. The Big Bad Ogre Oct. Nov. Dec.
162. Feature branch name of branch
163. Feature branch authorFirstName_authorLastName/description_of_branch
164. Feature branch authorFirstName_authorLastName/description_of_branch
165. Feature branch authorFirstName_authorLastName/description_of_branch
166. Feature branch authorFirstName_authorLastName/description_of_branch
167. Feature branch authorFirstName_authorLastName/description_of_branch
168. Feature branch
169. What branch am I on?
170. What branch am I on?
171. * bash script at end of slides Display branch in prompt
172. Display branch in prompt
173. History as a graph
174. History as a graph
175. History as a graph HEAD is at this commit
176. History as a graph HEAD is at this commit Parent of next commit
177. History as a graph origin/master is at this commit! (master on GitHub)
178. History as a graph master is at this commit! (local)
179. History as a graph jacob_grimm/big_bad_ogre is at this commit! (local)!
180. the long running branch The Big Bad Ogre, Oct. Nov. Dec.
181. the long running branch The Big Bad Ogre, Oct. Nov. Dec.
182. the long running branch The Big Bad Ogre, Oct. Nov. Dec.
183. the long running branch The Big Bad Ogre, Oct. Nov. Dec. Replaces ‘wolf’ with ‘ogre’
184. Wilhelm has made changes to origin/master In the meantime
185. origin/master on remote (GitHub)
186. Update master with origin/master
187. Update master with origin/master
188. move code from remote to local Update master with origin/master
189. name of remote! (github) Update master with origin/master
190. name of branch Update master with origin/master
191. Update master with origin/master
192. This means it worked! Update master with origin/master
193. Understanding history as a graph Parent of next commit
194. Understanding history as a graph
195. jacob_grimm/big_bad_ogre and ! origin/master and master have diverged Understanding history as a graph
196. jacob_grimm/big_bad_ogre Understanding history as a graph
197. origin/master and master Understanding history as a graph
198. Understanding history as a graph Find last common commit
199. Understanding history as a graph Find last common commit
200. Find last common commit Understanding history as a graph
201. Understanding history as a graph Find last common commit
202. jacob_grimm/big_bad_ogre has commits Understanding history as a graph
203. origin/master and master have commits Understanding history as a graph
204. master jacob_grimm/big_bad_ogre
205. To bubble, or not to bubble
206. Merge (bubble)
207. Merge (bubble)
208. Merge (bubble)
209. Branch to merge into jacob_grimm/big_bad_ogre Merge (bubble)
210. opens editor Merge (bubble)
211. auto populate commit message Merge (bubble)
212. save Merge (bubble)
213. Merge (bubble)
214. This means it worked! Merge (bubble)
215. History as a graph
216. History as a graph
217. ‘bubble’ History as a graph
218. merge commit History as a graph
219. HEAD History as a graph
220. jacob_grimm/big_bad_ogre History as a graph
221. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
222. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
223. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
224. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
225. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
226. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
227. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
228. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
229. jacob_grimm/big_bad_ogre has commits (merge included) History as a graph
230. History as a graph jacob_grimm/big_bad_ogre has commits (merge included)
231. origin/master and master History as a graph
232. origin/master and master have commits (merge NOT included) History as a graph
233. origin/master and master have commits (merge NOT included) History as a graph
234. origin/master and master have commits (merge NOT included) History as a graph
235. origin/master and master have commits (merge NOT included) History as a graph
236. origin/master and master have commits (merge NOT included) History as a graph
237. origin/master and master have commits (merge NOT included) History as a graph
238. History as a graph origin/master and master have commits (merge NOT included)
239. If we now merged jacob_grimm/big_bad_ogre into master,! the merge commit would then be included in master.
240. From the perspective of master,! I don’t want to know every time Jacob Grimm! merged master into jacob_grimm/big_bad_ogre. If we now merged jacob_grimm/big_bad_ogre into master,! the merge commit would then be included in master.
241. From the perspective of master,! I don’t want to know every time Jacob Grimm! merged master into jacob_grimm/big_bad_ogre. Let’s fix that! If we now merged jacob_grimm/big_bad_ogre into master,! the merge commit would then be included in master.
242. Undo merge
243. Undo merge Find sha before merge commit
244. Undo merge Find sha before merge commit
245. Undo merge Find sha before merge commit
246. Undo merge Find sha before merge commit
247. Undo merge Find sha before merge commit
248. Undo merge Copy sha to clipboard
249. Undo merge undo
250. Undo merge paste sha from clipboard
251. Undo merge
252. History as graph
253. History as graph
254. History as graph HEAD is now at sha e492be4 AND merge is gone
255. History as graph HEAD is now at sha e492be4 AND merge is gone
256. History as graph HEAD is now at sha e492be4 AND merge is gone
257. History as graph HEAD is now at sha e492be4 AND merge is gone
258. As if merge never happened
259. master jacob_grim/big_bad_gore
260. Rebase (no bubble)
261. Rebase (no bubble)
262. History as graph
263. HEAD History as graph
264. jacob_grimm/big_bad_ogre has commits History as graph
265. jacob_grimm/big_bad_ogre has commits History as graph
266. jacob_grimm/big_bad_ogre has commits History as graph
267. jacob_grimm/big_bad_ogre has commits History as graph
268. jacob_grimm/big_bad_ogre has commits History as graph
269. jacob_grimm/big_bad_ogre has commits History as graph
270. jacob_grimm/big_bad_ogre has commits History as graph
271. origin/master and master History as graph
272. History as graph origin/master and master have commits
273. History as graph origin/master and master have commits
274. History as graph origin/master and master have commits
275. History as graph origin/master and master have commits
276. History as graph origin/master and master have commits
277. History as graph origin/master and master have commits
278. However …
279. Snapshot before rebase
280. sha was e492be4 Snapshot before rebase
281. Current
282. sha is 106db2 Current
283. e492be4 106d6b2 Current
284. Push jacob_grimm/big_bad_ogre to remote (github) remote name
285. Push jacob_grimm/big_bad_ogre to remote (github) branch name
286. Push jacob_grimm/big_bad_ogre to remote (github) branch name Will create branch on origin if does not exist
287. Push jacob_grimm/big_bad_ogre to remote (github)
288. Remote (github)
289. master jacob_grimm/big_bad_ogre
290. To bubble, or not to bubble
291. Merge (no bubble)
292. Merge (no bubble)
293. Branch to merge into master Merge (no bubble)
294. Merge (no bubble)
295. Merge (no bubble)
296. History as a graph no ‘bubble’, why? git will try to ‘fast forward’ merge
297. History as a graph No ‘bubble’!?! Git will ‘fast forward’ merge if possible! I like to see the feature branch ‘bubble’
298. History as a graph No ‘bubble’!?! Git will ‘fast forward’ merge if possible! I like to see the feature branch ‘bubble’
299. History as a graph No ‘bubble’!?! Git will ‘fast forward’ merge if possible!
300. Fast Forward 1 2 3 4 5 6 HEAD, master jacob_grimm/big_bad_ogre
301. 5 Fast Forward 1 2 3 4 6 HEAD, master jacob_grimm/big_bad_ogre
302. 5 Fast Forward 1 2 3 4 6 , HEAD, master jacob_grimm/big_bad_ogre
303. 5 Fast Forward 1 2 3 4 6 , HEAD, master jacob_grimm/big_bad_ogre
304. History as a graph No ‘bubble’!?! Git will ‘fast forward’ merge if possible! I like to see feature branch ‘bubble’(s)
305. Let’s make a feature branch ‘bubble’
306. Undo merge
307. Undo merge commit before merge
308. copy sha to clipboard Undo merge
309. Undo merge
310. Undo merge undo
311. Undo merge paste sha from clipboard
312. Undo merge
313. Undo merge
314. Undo merge
315. As if merge never happened
316. Merge (bubble) no fast-forward merge
317. Branch to merge into master Merge (bubble)
318. opens editor
319. auto populates merge commit message
320. save
321. recursive strategy! (not fast forward) Merge (bubble)
322. History as graph
323. History as graph
324. History as graph
325. merge commit History as graph
326. master has commits History as graph
327. master has commits History as graph
328. master has commits History as graph
329. master has commits History as graph
330. master has commits History as graph
331. master has commits History as graph
332. master has commits History as graph
333. master has commits History as graph
334. master has commits History as graph
335. History as graph
336. jacob_grimm/big_bad_ogre has commits History as graph
337. jacob_grimm/big_bad_ogre has commits History as graph
338. jacob_grimm/big_bad_ogre has commits History as graph
339. jacob_grimm/big_bad_ogre has commits History as graph
340. jacob_grimm/big_bad_ogre has commits History as graph
341. jacob_grimm/big_bad_ogre has commits History as graph
342. jacob_grimm/big_bad_ogre has commits History as graph
343. History as graph
344. History as graph origin/master has commits
345. History as graph
346. History as graph
347. History as graph
348. History as graph
349. History as graph
350. History as graph
351. remote name branch name Push to remote (github)
352. Push to remote (github)
353. Remote (GitHub)
354. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
355. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
356. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
357. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
358. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
359. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
360. Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase
361. Install Git! http://git-scm.com/book/en/v2/Getting-Started-Installing-Git http://kj-prince.com/code/install-git-mac-osx-homebrew/ Git Pro (great book)! http://git-scm.com/book/en/v2 Bash Completion! https://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion https://conra.dk/2013/01/18/git-on-osx.html Display git branch name in prompt! http://stackoverflow.com/questions/17333531/how-can-i-display-the-current- branch-and-folder-path-in-terminal Git Workflow Videos with Andy Lindeman! http://vimeo.com/33166064 http://vimeo.com/33165748 Well formed commit messages! http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html http://robots.thoughtbot.com/5-useful-tips-for-a-better-commit-message Resources