Git Micro Workflows: Little Red Riding Hood

Rails Girls Atl 06/24/2015

Transcript

1. Git Workflows: Little Red Riding Hood !
2. Git Micro Workflows: Little Red Riding Hood !
3. Git Micro Workflows: Little Red Riding Hood !
4. Travis Douce travis@bignerdranch.com! travisdouce@gmail.com! Twitter: @travisdouce GitHub: tdouce
5. Git Micro Workflows: Little Red Riding Hood !
6. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
7. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
8. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
9. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
10. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
11. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
12. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
13. The better you are with your tools, the better developer you will be
14. What is Git?
15. Distributed Version Control What is Git?
16. Distributed Version Control What is Git?
17. essay.doc
18. essay.doc essay_intro_1.doc
19. essay_intro_2.doc essay.doc essay_intro_1.doc
20. essay_intro_body_3.doc essay.doc essay_intro_1.doc essay_intro_2.doc
21. The Brothers Grimm Wilhelm Jacob
22. Getting Started
23. Create Repo
24. Create Repo Repository created in this directory
25. Status Status of repository
26. Status
27. Status
28. Create file Create file little_red_riding_hood.txt
29. Status
30. Status
31. Status
32. Add Color Configure output with color
33. Add Color Global
34. Add Color Yes, color the output
35. Status
36. Status
37. Track Track changes to file
38. Track Name of file
39. Status
40. Staged
41. Commit Commit all files in staging ! to local repository
42. opens editor
43. * See end of slides for writing great commit messages commit message
44. * See end of slides for writing great commit messages extended description
45. save and close
46. Commit It worked!
47. Status
48. Status
49. Jacob writes … The Little Red Riding Hood
50. little_red_riding_hood.txt
51. little_red_riding_hood.txt
52. little_red_riding_hood.txt
53. save and close
54. Status
55. Modified
56. Stage
57. Staging? What’s the purpose of
58. Staging? All files in staging will be included in next commit What’s the purpose of
59. Status
60. Status
61. Commit Commit all files in staging ! to local repository
62. opens editor opens editor save opens editor
63. opens editor opens editor save commit message
64. opens editor opens editor save save and close
65. Commit
66. Status
67. Status
68. Status
69. Work Flow # 1
70. Work Flow # 1 Modified Staged Committed
71. Work Flow # 1 Modified Staged Committed
72. Work Flow # 1 Modified Staged Committed
73. Jacob writes an introduction
74. Jacob writes an introduction and that is HARD
75. little_red_riding_hood.txt
76. little_red_riding_hood.txt
77. save and close
78. Status
79. Modified
80. Stage
81. Status
82. Staged
83. Commit
84. opens editor
85. commit message
86. Commit
87. little_red_riding_hood.txt
88. little_red_riding_hood.txt
89. little_red_riding_hood.txt
90. little_red_riding_hood.txt
91. It’s good, but … little_red_riding_hood.txt
92. It’s good, but … save and close
93. Make a WIP commit
94. Make a WIP commit Work In Progress
95. Make a WIP commit Work In Progress Just a convention
96. Status
97. Status
98. Stage
99. Commit Commit and provide message
100. Commit Commit message
101. Commit
102. little_red_riding_hood.txt
103. little_red_riding_hood.txt
104. little_red_riding_hood.txt
105. little_red_riding_hood.txt
106. Yes, this is it! little_red_riding_hood.txt
107. Yes, this is it! save and close
108. Status
109. Modified
110. Stage
111. Commit Commit and provide message
112. Commit Commit message
113. Commit
114. Work Flow # 2
115. Work Flow # 2 Make WIP commits
116. Work Flow # 2 Developing complicated features Make WIP commits
117. Work Flow # 2 Preserve each implementation Make WIP commits Developing complicated features
118. Git history
119. Git history (and the many ways to view it)
120. Understanding git history
121. Log
122. Log
123. Log Newest Oldest
124. Log #5 Newest Oldest
125. Log #4 Newest Oldest
126. Log #3 Newest Oldest
127. Log #2 Newest Oldest
128. Log #1 Newest Oldest
129. Log Author Newest Oldest
130. Log Date Newest Oldest
131. Log Commit message Newest Oldest
132. What are these?
133. These are shas Unique identifier! for commit
134. Another way to view history
135. Log with patch A more details view of history
136. Log with patch Patch flag
137. Log with patch Patch *Displaying most recent commit only
138. And, another way to view history
139. Log as graph *lg alias at end of slides Jacob configured a git alias, lg. When entered, history is displayed a graph
140. Log as graph Newest Oldest
141. Log as graph Newest Oldest
142. Log as graph Commit message Newest Oldest
143. Log as graph Author Newest Oldest
144. Log as graph Date Newest Oldest
145. Newest Oldest Log as graph
146. Newest Oldest Log as graph
147. Newest Oldest Log as graph
148. Newest Oldest Log as graph
149. Newest Oldest Log as graph
150. Newest Oldest Log as graph
151. Newest Oldest Log as graph
152. Newest Oldest Log as graph
153. Newest Oldest Log as graph
154. What is HEAD? HEAD Parent of next commit
155. What is HEAD? 1 2 HEAD, master Newest Oldest
156. 1 2 HEAD, master 3 Next commit is on top of HEAD What is HEAD? Newest Oldest
157. 1 2 HEAD, master 3 What is HEAD? Newest Oldest
158. 1 2 HEAD, master 3 What is HEAD? Newest Oldest
159. 1 2 HEAD, master 3 4 Next commit is on top of HEAD What is HEAD? Newest Oldest
160. 1 2 HEAD, master 3 4 What is HEAD? Newest Oldest
161. 1 2 HEAD, master 3 4 What is HEAD? Newest Oldest
162. What is master? master Default branch (we’ll cover branches later)
163. Understanding git history
164. Understanding log as graph master has commits master
165. Understanding log as graph master has commits
166. Understanding log as graph master has commits
167. Understanding log as graph master has commits
168. Understanding log as graph master has commits
169. Understanding log as graph master has commits
170. Understanding log as graph master has commits
171. Understanding log as graph master has commits
172. Understanding log as graph master has commits
173. The ugly history
174. 3 commits about writing introduction Ugly history
175. Proposed clean history 3 commits about writing introduction 1 commit
176. Why do we care about a clean history?
177. Re-write history
178. Start rewriting history at! Adds introductory sentence commit Log as a graph
179. Log as a graph Start rewriting history at! Adds introductory sentence commit
180. Log as a graph Start rewriting history at! Adds introductory sentence commit
181. Log as a graph Start rewriting history at! Adds introductory sentence commit
182. Log as a graph Start rewriting history at! Adds introductory sentence commit
183. copy sha to clipboard Log as a graph
184. Rebase: interactive Re-write history
185. Interactive mode Rebase: interactive
186. sha from clipboard Rebase: interactive
187. Not child of sha, but this sha Rebase: interactive
188. What will happen? (theoretically)
189. Rebase: Interactive 1 2 3 4 HEAD, master Newest Oldest
190. Rebase: Interactive HEAD, master Newest Oldest Start rebasing at! this commit 1 2 3 4
191. 2 3 4 HEAD, master 1 Rebase: Interactive
192. 2 3 4 HEAD, master 1 Rebase: Interactive 2 3 4
193. Meld together 1 Rebase: Interactive 2 3 4 HEAD, master 2 3 4
194. 5 New sha 1 Rebase: Interactive 2 3 4 HEAD, master
195. 5 1 Rebase: Interactive 2 3 4 HEAD, master
196. 5 1 HEAD, master Rebase: Interactive 2 3 4 HEAD, master
197. Created a new base 5 1 HEAD, master Rebase: Interactive 2 3 4 HEAD, master
198. Rebase: interactive
199. opens editor
200. Newest Oldest
201. Newest Oldest
202. Newest Oldest
203. Newest Oldest
208. f f
209. f f save and close
210. Rebase: interactive
211. Rebase: interactive It worked!
212. Rebase: interactive $ git rebase --abort If things go wrong!
213. Rebase Double edged sword
214. Understanding git history
215. Log as a graph
216. Log as a graph
217. Log as a graph 3 commits about writing introduction 1 commit
218. 8979394 != ed04ae2 Log as a graph
219. Work Flow # 3
220. Work Flow # 3 Keep a clean history
221. Work Flow # 3 (Not so much how you got there, but sometimes I do) I want to know what you did Keep a clean history
222. Work Flow # 3 (Not so much how you got there, but sometimes I do) Helps with code reviews by revealing intent I want to know what you did Keep a clean history
223. Work Flow # 3 (Not so much how you got there, but sometimes I do) Helps with code reviews by revealing intent Can rebase to organize history I want to know what you did Keep a clean history
224. 3 a.m. and Jacob is
225. little_red_riding_hood.txt
226. little_red_riding_hood.txt
227. little_red_riding_hood.txt
228. Status
229. Modified
230. Commit Stage and commit
231. open
232. commit message
233. save and close
234. Commit
235. Log with patch
236. Log with patch Displaying most recent commit only
237. Jacob realizes commit error
238. Jacob fixes commit error
239. Jacob fixes commit error Undo last commit
240. Understanding git history
241. Proposed Undo
242. Proposed Undo Erroneous commit
243. Proposed Undo Commit prior to error
244. Proposed Undo Move HEAD and master backwards one commit
245. Proposed Undo Move HEAD and master backwards one commit
246. Reset Move HEAD back 1 commit
247. Move HEAD back 1 commit (but keep changes) Reset
248. HEAD Reset
249. Backwards 1 commit Reset
250. Reset It worked!
251. Log as graph
252. Log as graph
253. Log as graph
254. Log as graph
255. Jacob rewrites erroneous sentence
256. little_red_riding_hood.txt
257. little_red_riding_hood.txt
258. little_red_riding_hood.txt
259. little_red_riding_hood.txt
260. save and close
261. Status
262. Modified
263. Stage
264. Commit with verbose View changes while writing commit message
265. Commit with verbose Verbose Flag
266. open
267. commit message
268. save and close
269. Commit with verbose
270. Commit with verbose ALWAYS
271. Commit with verbose Verbose commit with $ git ci
272. Commit with verbose Global
273. Commit with verbose When enter $ git ci
274. Commit with verbose Then commit with —verbose
275. Work Flow # 4
276. Work Flow # 4 AlWAYS! Verbose commit
277. Work Flow # 4 Write better commit messages AlWAYS! Verbose commit
278. Work Flow # 4 Write better commit messages Reduce erroneous commits Verbose commit AlWAYS!
279. Jacob writes body of Little Red Riding Hood using feature branches
280. Jacob writes body of Little Red Riding Hood using feature branches
281. List branches List all branches in repository
282. List branches On master branch Remember, master is the default branch
283. Branches Create branch and switch to it
284. Branches Branch name
285. Branches authorFirstName_authorLastName/description_of_branch Branch name
286. authorFirstName_authorLastName/description_of_branch Branches Branch name
287. Branches authorFirstName_authorLastName/description_of_branch Branch name
288. Branches authorFirstName_authorLastName/description_of_branch Branch name
289. Branches authorFirstName_authorLastName/description_of_branch Branch name
290. Branches jacob_grimm/body Branch name
291. Branches jacob_grimm/body Branch name
292. Branches jacob_grimm/body Branch name
293. Branches jacob_grimm/body Branch name
294. Branches jacob_grimm/body Branch name
295. Branches Just a convention Branch name
296. Branches It worked!! Created jacob_grimm/body and switched to it
297. Branches List all branches in repository
298. Branches 2 branches
299. Branches On jacob_grimm/body branch
300. Understanding git history
301. Log as graph
302. Log as graph
303. HEAD is at commit Log as graph
304. master is at commit Log as graph
305. HEAD is at commit jacob_grimm/body Log as graph
306. master and jacob_grimm/body have commits Log as graph
307. master and jacob_grimm/body have commits Log as graph
308. master and jacob_grimm/body have commits Log as graph
309. master and jacob_grimm/body have commits Log as graph
310. What branch am I on? You are here
311. What branch am I on?
312. Display branch in prompt * bash script at end of slides
313. Display branch in prompt Always display branch name in prompt
314. little_red_riding_hood.txt
315. little_red_riding_hood.txt
316. little_red_riding_hood.txt save and close
317. Status
318. Modified
319. Commit Stage and commit
320. open
321. commit message
322. save and close
323. Commit
324. The history of master and jacob_grimm/body have diverged
325. Understanding git history
326. Log as graph
327. jacob_grimm/body has commits Log as graph
328. jacob_grimm/body has commits Log as graph
329. jacob_grimm/body has commits Log as graph
330. jacob_grimm/body has commits Log as graph
331. jacob_grimm/body has commits Log as graph
332. jacob_grimm/body has commits Log as graph
333. master has commits Log as graph
334. master has commits Log as graph
335. master has commits Log as graph
336. master has commits Log as graph
337. master has commits Log as graph
338. master does NOT have commit Log as graph
339. Work Flow # 5
340. Work Flow # 5 Feature branches
341. Work Flow # 5 Feature branches Isolate feature development
342. Work Flow # 5 Feature branches Isolate feature development Easily determine author of feature
343. Jacob finishes jacob_grimm/body
344. Decides it should be in the story of Little Red Riding Hood
345. Incorporate jacob_grimm/body into master
346. Switch branches Currently, on jacob_grimm/body branch
347. Switch branches Switch to master branch
348. Switch branches Branch name to switch to
349. Switch branches It worked!! Switched to master
350. Merge Incorporate jacob_grimm/body into master
351. Branch name to incorporate into master Merge
352. What will happen? (theoretically)
353. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
354. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
355. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
356. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
357. 5 1 2 3 4 6 HEAD, master jacob_grimm/body Newest Oldest
358. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
359. 5 1 2 3 4 6 , HEAD, master jacob_grimm/body Newest Oldest
360. 5 1 2 3 4 6 , HEAD, master jacob_grimm/body Newest Oldest
361. Merge
362. Merge It worked!
363. Merge Fast Forward merge strategy
364. if possible. Git will Fast-foward merge,
365. Understanding git history
366. Log as graph
367. master and jacob_grimm/body have commits Log as graph
368. Log as graph master and jacob_grimm/body have commits
369. Log as graph master and jacob_grimm/body have commits
370. Log as graph master and jacob_grimm/body have commits
371. Log as graph master and jacob_grimm/body have commits
372. Log as graph master and jacob_grimm/body have commits
373. What commits originated in jacob_grimm/body?
374. Log as graph
375. What commits originated in jacob_grimm/body? ¯\_(π)_/¯
376. Make it easy to determine the commits that originated in jacob_grimm/body
377. with merge bubbles Make it easy to determine the commits that originated in jacob_grimm/body
378. What is a merge bubble?
379. What is a merge bubble? We’ll see in a moment :)
380. First, Jacob must undo the merge
381. Log as graph
382. Log as graph
383. Log as graph Find commit before merge
384. Log as graph Find commit before merge
385. Log as graph Find commit before merge
386. Log as graph Find commit before merge
387. Log as graph Copy sha to clipboard
388. Reset Move HEAD back to commit
389. Reset Discard changes in commit
390. Paste sha from clipboard Reset
391. It worked!
392. Log as graph
393. Log as graph
394. Log as graph
395. As if merge never happened
396. Again, incorporate jacob_grimm/body into master !
397. And, this time create a merge bubble
398. Merge Incorporate jacob_grimm/body into master! and make a merge bubble
399. Branch to merge into master Merge
400. Do not use Fast-forward strategy Merge
401. Merge Do not use Fast-forward strategy Create a merge bubble!
402. What will happen? (theoretically)
403. 1 2 3 4 5 6 HEAD, master jacob_grimm/body
404. 1 2 3 4 5 6 HEAD, master jacob_grimm/body
405. 1 2 3 4 5 6 HEAD, master jacob_grimm/body
406. 1 2 3 4 5 6 HEAD, master jacob_grimm/body
407. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Merge commit 7
408. 1 2 3 4 5 6 HEAD, master jacob_grimm/body 7
409. 1 2 3 4 5 6 HEAD, master jacob_grimm/body 7 Merge Bubble
410. 1 2 3 4 5 6 HEAD, master jacob_grimm/body 7 Originated from jacob_grimm/body
411. Merge with Recursive strategy
412. Merge
413. merge commit opens editor
414. auto populates merge commit message
415. save and close
416. Merge
417. It worked! Merge
418. Merged with recursive strategy Merge
419. Understanding git history
420. Log as graph
421. Log as graph
422. Merge bubble Log as graph
423. Originated from jacob_grimm/body Log as graph
424. Made it easy to determine origin of commit
425. merge bubble == feature branch
426. HEAD and master are at commit Log as graph
427. Merge commit Log as graph HEAD and master are at commit
428. Log as graph master has commits
429. master has commits Log as graph
430. master has commits Log as graph
431. master has commits Log as graph
432. master has commits Log as graph
433. master has commits Log as graph
434. jacob_grimm/body has commits Log as graph
435. jacob_grimm/body has commits Log as graph
436. jacob_grimm/body has commits Log as graph
437. jacob_grimm/body has commits Log as graph
438. jacob_grimm/body has commits Log as graph
439. jacob_grimm/body does NOT have merge commit Log as graph
440. Work Flow # 6 No Fast Forward merge strategy
441. Work Flow # 6 Use when merging feature branches No Fast Forward merge strategy
442. Work Flow # 6 Use when merging feature branches Easily determine from which feature branch a commit originated No Fast Forward merge strategy
443. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
444. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
445. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
446. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
447. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
448. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
449. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
450. 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! 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