Git Workflows: Little Red Riding Hood and the Big Bad Ogre

Presented at DevNexus 2015

Transcript

1. The Big Bad Ogre Git Workflows: Little Red Riding Hood and
2. The Big Bad Ogre Git Micro Workflows: Little Red Riding Hood and
3. The Big Bad Ogre Git Micro Workflows: Little Red Riding Hood and
4. Travis Douce travis@bignerdranch.com! travisdouce@gmail.com! Twitter: @travisdouce GitHub: tdouce
6. Write Develop Teach
7. Objective-C iOS Write Develop Teach Design
8. Objective-C se habla español iOS Write Develop Teach Design
9. Write Develop Teach Android Design
10. se habla español Write Develop Teach Android Design
11. Write Develop Teach Backend Web
12. Frontend Web Write Develop Teach
13. Mac Write Develop Teach Cocoa iOS and OS X Internals
14. Write Develop Teach
15. Write Develop Teach iOS UI/UX Cocoa
16. Write Develop Teach
17. Write Develop Teach
18. Write Develop Teach #1 on Amazon
19. The Big Bad Ogre Git Micro Workflows: Little Red Riding Hood and
20. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
21. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
22. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
23. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
24. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
25. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
26. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
27. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
28. What is Git?
29. Distributed Version Control What is Git?
30. Distributed Version Control What is Git?
31. essay.doc
32. essay.doc essay_intro_1.doc
33. essay_intro_2.doc essay.doc essay_intro_1.doc
34. essay_intro_body_3.doc essay.doc essay_intro_1.doc essay_intro_2.doc
35. The Brothers Grimm Wilhelm Jacob
36. Getting Started
37. Create Repo
38. Create Repo Repository created in this directory
39. Status Status of repository
40. Status
41. Status
42. Create file Create file little_red_riding_hood.txt
43. Status
44. Status
45. Status
46. Add Color Configure output with color
47. Add Color Global
48. Add Color Yes, color the output
49. Status
50. Status
51. Track Track changes to file
52. Track Name of file
53. Status
54. Staged
55. Commit Commit all files in staging ! to local repository
56. opens editor
57. * See end of slides for writing great commit messages commit message
58. * See end of slides for writing great commit messages extended description
59. save and close
60. Commit It worked!
61. Status
62. Status
63. Jacob writes … The Little Red Riding Hood
64. little_red_riding_hood.txt
65. little_red_riding_hood.txt
66. little_red_riding_hood.txt
67. save and close
68. Status
69. Modified
70. Stage
71. Staging? What’s the purpose of
72. Staging? All files in staging will be included in next commit What’s the purpose of
73. Status
74. Status
75. Commit Commit all files in staging ! to local repository
76. opens editor opens editor save opens editor
77. opens editor opens editor save commit message
78. opens editor opens editor save save and close
79. Commit
80. Status
81. Status
82. Status
83. Work Flow # 1
84. Work Flow # 1 Modified Staged Committed
85. Work Flow # 1 Modified Staged Committed
86. Work Flow # 1 Modified Staged Committed
87. Jacob writes an introduction
88. Jacob writes an introduction and that is HARD
89. little_red_riding_hood.txt
90. little_red_riding_hood.txt
91. save and close
92. Status
93. Modified
94. Stage
95. Status
96. Staged
97. Commit
98. opens editor
99. commit message
100. Commit
101. little_red_riding_hood.txt
102. little_red_riding_hood.txt
103. little_red_riding_hood.txt
104. little_red_riding_hood.txt
105. It’s good, but … little_red_riding_hood.txt
106. It’s good, but … save and close
107. Make a WIP commit
108. Make a WIP commit Work In Progress
109. Make a WIP commit Work In Progress Just a convention
110. Status
111. Status
112. Stage
113. Commit Commit and provide message
114. Commit Commit message
115. Commit
116. little_red_riding_hood.txt
117. little_red_riding_hood.txt
118. little_red_riding_hood.txt
119. little_red_riding_hood.txt
120. Yes, this is it! little_red_riding_hood.txt
121. Yes, this is it! save and close
122. Status
123. Modified
124. Stage
125. Commit Commit and provide message
126. Commit Commit message
127. Commit
128. Work Flow # 2
129. Work Flow # 2 Make WIP commits
130. Work Flow # 2 Developing complicated features Make WIP commits
131. Work Flow # 2 Preserve each implementation Make WIP commits Developing complicated features
132. Git history
133. Git history (and the many ways to view it)
134. Understanding git history
135. Log
136. Log
137. Log Newest Oldest
138. Log #5 Newest Oldest
139. Log #4 Newest Oldest
140. Log #3 Newest Oldest
141. Log #2 Newest Oldest
142. Log #1 Newest Oldest
143. Log Author Newest Oldest
144. Log Date Newest Oldest
145. Log Commit message Newest Oldest
146. What are these?
147. These are shas Unique identifier! for commit
148. Another way to view history
149. Log with patch A more details view of history
150. Log with patch Patch flag
151. Log with patch Patch *Displaying most recent commit only
152. And, another way to view history
153. Log as graph *lg alias at end of slides Jacob configured a git alias, lg. When entered, history is displayed a graph
154. Log as graph Newest Oldest
155. Log as graph Newest Oldest
156. Log as graph Commit message Newest Oldest
157. Log as graph Author Newest Oldest
158. Log as graph Date Newest Oldest
159. Newest Oldest Log as graph
160. Newest Oldest Log as graph
161. Newest Oldest Log as graph
162. Newest Oldest Log as graph
163. Newest Oldest Log as graph
164. Newest Oldest Log as graph
165. Newest Oldest Log as graph
166. Newest Oldest Log as graph
167. Newest Oldest Log as graph
168. What is HEAD? HEAD Parent of next commit
169. What is HEAD? 1 2 HEAD, master Newest Oldest
170. 1 2 HEAD, master 3 Next commit is on top of HEAD What is HEAD? Newest Oldest
171. 1 2 HEAD, master 3 What is HEAD? Newest Oldest
172. 1 2 HEAD, master 3 What is HEAD? Newest Oldest
173. 1 2 HEAD, master 3 4 Next commit is on top of HEAD What is HEAD? Newest Oldest
174. 1 2 HEAD, master 3 4 What is HEAD? Newest Oldest
175. 1 2 HEAD, master 3 4 What is HEAD? Newest Oldest
176. What is master? master Default branch (we’ll cover branches later)
177. Understanding git history
178. Understanding log as graph master has commits master
179. Understanding log as graph master has commits
180. Understanding log as graph master has commits
181. Understanding log as graph master has commits
182. Understanding log as graph master has commits
183. Understanding log as graph master has commits
184. Understanding log as graph master has commits
185. Understanding log as graph master has commits
186. Understanding log as graph master has commits
187. The ugly history
188. 3 commits about writing introduction Ugly history
189. Proposed clean history 3 commits about writing introduction 1 commit
190. Why do we care about a clean history?
191. Re-write history
192. Start rewriting history at! Adds introductory sentence commit Log as a graph
193. Log as a graph Start rewriting history at! Adds introductory sentence commit
194. Log as a graph Start rewriting history at! Adds introductory sentence commit
195. Log as a graph Start rewriting history at! Adds introductory sentence commit
196. Log as a graph Start rewriting history at! Adds introductory sentence commit
197. copy sha to clipboard Log as a graph
198. Rebase: interactive Re-write history
199. Interactive mode Rebase: interactive
200. sha from clipboard Rebase: interactive
201. Not child of sha, but this sha Rebase: interactive
202. What will happen? (theoretically)
203. Rebase: Interactive 1 2 3 4 HEAD, master Newest Oldest
204. Rebase: Interactive HEAD, master Newest Oldest Start rebasing at! this commit 1 2 3 4
205. 2 3 4 HEAD, master 1 Rebase: Interactive
206. 2 3 4 HEAD, master 1 Rebase: Interactive 2 3 4
207. Meld together 1 Rebase: Interactive 2 3 4 HEAD, master 2 3 4
208. 5 New sha 1 Rebase: Interactive 2 3 4 HEAD, master
209. 5 1 Rebase: Interactive 2 3 4 HEAD, master
210. 5 1 HEAD, master Rebase: Interactive 2 3 4 HEAD, master
211. Created a new base 5 1 HEAD, master Rebase: Interactive 2 3 4 HEAD, master
212. Rebase: interactive
213. opens editor
214. Newest Oldest
215. Newest Oldest
216. Newest Oldest
217. Newest Oldest
222. f f
223. f f save and close
224. Rebase: interactive
225. Rebase: interactive It worked!
226. Rebase: interactive $ git rebase --abort If things go wrong!
227. Rebase Double edged sword
228. Understanding git history
229. Log as a graph
230. Log as a graph
231. Log as a graph 3 commits about writing introduction 1 commit
232. 8979394 != ed04ae2 Log as a graph
233. Work Flow # 3
234. Work Flow # 3 Keep a clean history
235. 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
236. 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
237. 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
238. 3 a.m. and Jacob is
239. little_red_riding_hood.txt
240. little_red_riding_hood.txt
241. little_red_riding_hood.txt
242. Status
243. Modified
244. Commit Stage and commit
245. open
246. commit message
247. save and close
248. Commit
249. Log with patch
250. Log with patch Displaying most recent commit only
251. Jacob realizes commit error
252. Jacob fixes commit error
253. Jacob fixes commit error Undo last commit
254. Understanding git history
255. Proposed Undo
256. Proposed Undo Erroneous commit
257. Proposed Undo Commit prior to error
258. Proposed Undo Move HEAD and master backwards one commit
259. Proposed Undo Move HEAD and master backwards one commit
260. Reset Move HEAD back 1 commit
261. Move HEAD back 1 commit (but keep changes) Reset
262. HEAD Reset
263. Backwards 1 commit Reset
264. Reset It worked!
265. Log as graph
266. Log as graph
267. Log as graph
268. Log as graph
269. Jacob rewrites erroneous sentence
270. little_red_riding_hood.txt
271. little_red_riding_hood.txt
272. little_red_riding_hood.txt
273. little_red_riding_hood.txt
274. save and close
275. Status
276. Modified
277. Stage
278. Commit with verbose View changes while writing commit message
279. Commit with verbose Verbose Flag
280. open
281. commit message
282. save and close
283. Commit with verbose
284. Commit with verbose ALWAYS
285. Commit with verbose Verbose commit with $ git ci
286. Commit with verbose Global
287. Commit with verbose When enter $ git ci
288. Commit with verbose Then commit with —verbose
289. Work Flow # 4
290. Work Flow # 4 AlWAYS! Verbose commit
291. Work Flow # 4 Write better commit messages AlWAYS! Verbose commit
292. Work Flow # 4 Write better commit messages Reduce erroneous commits Verbose commit AlWAYS!
293. Jacob writes body of Little Red Riding Hood using feature branches
294. Jacob writes body of Little Red Riding Hood using feature branches
295. List branches List all branches in repository
296. List branches On master branch Remember, master is the default branch
297. Branches Create branch and switch to it
298. Branches Branch name
299. Branches authorFirstName_authorLastName/description_of_branch Branch name
300. authorFirstName_authorLastName/description_of_branch Branches Branch name
301. Branches authorFirstName_authorLastName/description_of_branch Branch name
302. Branches authorFirstName_authorLastName/description_of_branch Branch name
303. Branches authorFirstName_authorLastName/description_of_branch Branch name
304. Branches jacob_grimm/body Branch name
305. Branches jacob_grimm/body Branch name
306. Branches jacob_grimm/body Branch name
307. Branches jacob_grimm/body Branch name
308. Branches jacob_grimm/body Branch name
309. Branches Just a convention Branch name
310. Branches It worked!! Created jacob_grimm/body and switched to it
311. Branches List all branches in repository
312. Branches 2 branches
313. Branches On jacob_grimm/body branch
314. Understanding git history
315. Log as graph
316. Log as graph
317. HEAD is at commit Log as graph
318. master is at commit Log as graph
319. HEAD is at commit jacob_grimm/body Log as graph
320. master and jacob_grimm/body have commits Log as graph
321. master and jacob_grimm/body have commits Log as graph
322. master and jacob_grimm/body have commits Log as graph
323. master and jacob_grimm/body have commits Log as graph
324. What branch am I on? You are here
325. What branch am I on?
326. Display branch in prompt * bash script at end of slides
327. Display branch in prompt Always display branch name in prompt
328. little_red_riding_hood.txt
329. little_red_riding_hood.txt
330. little_red_riding_hood.txt save and close
331. Status
332. Modified
333. Commit Stage and commit
334. open
335. commit message
336. save and close
337. Commit
338. The history of master and jacob_grimm/body have diverged
339. Understanding git history
340. Log as graph
341. jacob_grimm/body has commits Log as graph
342. jacob_grimm/body has commits Log as graph
343. jacob_grimm/body has commits Log as graph
344. jacob_grimm/body has commits Log as graph
345. jacob_grimm/body has commits Log as graph
346. jacob_grimm/body has commits Log as graph
347. master does NOT have commit Log as graph
348. master has commits Log as graph
349. master has commits Log as graph
350. master has commits Log as graph
351. master has commits Log as graph
352. master has commits Log as graph
353. Work Flow # 5
354. Work Flow # 5 Feature branches
355. Work Flow # 5 Feature branches Isolate feature development
356. Work Flow # 5 Feature branches Isolate feature development Easily determine author of feature
357. Jacob finishes jacob_grimm/body
358. Decides it should be in the story of Little Red Riding Hood
359. Incorporate jacob_grimm/body into master
360. Switch branches Currently, on jacob_grimm/body branch
361. Switch branches Switch to master branch
362. Switch branches Branch name to switch to
363. Switch branches It worked!! Switched to master
364. Merge Incorporate jacob_grimm/body into master
365. Branch name to incorporate into master Merge
366. What will happen? (theoretically)
367. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
368. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
369. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
370. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
371. 5 1 2 3 4 6 HEAD, master jacob_grimm/body Newest Oldest
372. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest
373. 5 1 2 3 4 6 , HEAD, master jacob_grimm/body Newest Oldest
374. 5 1 2 3 4 6 , HEAD, master jacob_grimm/body Newest Oldest
375. Merge
376. Merge It worked!
377. Merge Fast Forward merge strategy
378. if possible. Git will Fast-foward merge,
379. Understanding git history
380. Log as graph
381. master and jacob_grimm/body have commits Log as graph
382. Log as graph master and jacob_grimm/body have commits
383. Log as graph master and jacob_grimm/body have commits
384. Log as graph master and jacob_grimm/body have commits
385. Log as graph master and jacob_grimm/body have commits
386. Log as graph master and jacob_grimm/body have commits
387. What commits originated in jacob_grimm/body?
388. Log as graph
389. What commits originated in jacob_grimm/body? ¯\_(π)_/¯
390. Make it easy to determine the commits that originated in jacob_grimm/body
391. with merge bubbles Make it easy to determine the commits that originated in jacob_grimm/body
392. What is a merge bubble?
393. What is a merge bubble? We’ll see in a moment :)
394. First, Jacob must undo the merge
395. Log as graph
396. Log as graph
397. Log as graph Find commit before merge
398. Log as graph Find commit before merge
399. Log as graph Find commit before merge
400. Log as graph Find commit before merge
401. Log as graph Copy sha to clipboard
402. Reset Move HEAD back to commit
403. Reset Discard changes in commit
404. Paste sha from clipboard Reset
405. It worked!
406. Log as graph
407. Log as graph
408. Log as graph
409. As if merge never happened
410. Again, incorporate jacob_grimm/body into master !
411. And, this time create a merge bubble
412. Merge Incorporate jacob_grimm/body into master! and make a merge bubble
413. Branch to merge into master Merge
414. Do not use Fast-forward strategy Merge
415. Merge Do not use Fast-forward strategy Create a merge bubble!
416. What will happen? (theoretically)
417. 1 2 3 4 5 6 HEAD, master jacob_grimm/body
418. 1 2 3 4 5 6 HEAD, master jacob_grimm/body
419. 1 2 3 4 5 6 HEAD, master jacob_grimm/body
420. 1 2 3 4 5 6 HEAD, master jacob_grimm/body
421. 1 2 3 4 5 6 HEAD, master jacob_grimm/body Merge commit 7
422. 1 2 3 4 5 6 HEAD, master jacob_grimm/body 7
423. 1 2 3 4 5 6 HEAD, master jacob_grimm/body 7 Merge Bubble
424. 1 2 3 4 5 6 HEAD, master jacob_grimm/body 7 Originated from jacob_grimm/body
425. Merge with Recursive strategy
426. Merge
427. merge commit opens editor
428. auto populates merge commit message
429. save and close
430. Merge
431. It worked! Merge
432. Merged with recursive strategy Merge
433. Understanding git history
434. Log as graph
435. Log as graph
436. Merge bubble Log as graph
437. Originated from jacob_grimm/body Log as graph
438. Made it easy to determine origin of commit
439. merge bubble == feature branch
440. HEAD and master are at commit Log as graph
441. Merge commit Log as graph HEAD and master are at commit
442. Log as graph master has commits
443. master has commits Log as graph
444. master has commits Log as graph
445. master has commits Log as graph
446. master has commits Log as graph
447. master has commits Log as graph
448. jacob_grimm/body has commits Log as graph
449. jacob_grimm/body has commits Log as graph
450. jacob_grimm/body has commits Log as graph
451. jacob_grimm/body has commits Log as graph
452. jacob_grimm/body has commits Log as graph
453. jacob_grimm/body does NOT have merge commit Log as graph
454. Work Flow # 6 No Fast Forward merge strategy
455. Work Flow # 6 Use when merging feature branches No Fast Forward merge strategy
456. Work Flow # 6 Use when merging feature branches Easily determine from which feature branch a commit originated No Fast Forward merge strategy
457. Jealous Wilhelm Grimm
458. Jealous Wilhelm Grimm
459. Jealous Wilhelm Grimm
460. Email How to collaborate with someone across the world?
461. Email How to collaborate with someone across the world?
462. Remotes
463. Remotes
464. jgrimm Create repo on GitHub (remote) jgrimm jgrimm
465. copy to clipboard jgrimm jgrimm Create repo on GitHub (remote)
466. Remotes Display all remotes configured with local repo
467. None configured Remotes
468. Remotes Add GitHub as a remote for local repo
469. How we will refer to GitHub locally (shortname) Remotes
470. Url associated with remote (GitHub) Remotes
471. Paste url from clipboard Remotes
472. Remotes Display all remotes configured with local repo
473. We configured a remote! Remotes
474. Move code to remote Move code from local repo to remote repo
475. Name of remote (GitHub) Move code to remote
476. Name of branch Move code to remote
478. 011101001010010010100100101 000100101010101010101011010 111010010010010001010101010
479. Move code to remote
480. It worked! Move code to remote
481. jgrimm jgrimm GitHub (remote)
482. Understanding git history
483. Log as graph
484. Log as graph
485. origin/master and master have commits Log as graph
486. What is origin/master?
487. What is origin/master? master branch on remote
488. What is origin/master? Remember: We aliased GitHub as origin master branch on remote
489. origin/master and master have commits Log as graph
490. origin/master and master have commits Log as graph
491. origin/master and master have commits Log as graph
492. origin/master and master have commits Log as graph
493. origin/master and master have commits Log as graph
494. origin/master and master have commits Log as graph
495. jacob_grimm/body has commits Log as graph
496. jacob_grimm/body has commits Log as graph
497. jacob_grimm/body has commits Log as graph
498. jacob_grimm/body has commits Log as graph
499. jacob_grimm/body has commits Log as graph
500. The Big Bad Ogre Jacob writes the ending
501. Create feature branch Create branch and switch to it
502. Create feature branch Name of branch jacob_grimm/big_bad_ogre
503. Create feature branch
505. little_red_riding_hood.txt open
506. Replace ‘wolf’ with ‘ogre’ little_red_riding_hood.txt
507. Replace ‘wolf’ with ‘ogre’ little_red_riding_hood.txt
508. Replace ‘wolf’ with ‘ogre’ little_red_riding_hood.txt
509. Replace ‘wolf’ with ‘ogre’ little_red_riding_hood.txt
510. Replace ‘wolf’ with ‘ogre’ little_red_riding_hood.txt save and close
511. Status
512. Modified
513. Commit
514. opens editor
515. opens editor commit message
516. save and close
517. Commit
518. While Jacob was busy writing jacob_grimm/big_bad_ogre
519. Wilhelm added to origin/master (GitHub)
520. Jacob it!
521. Jacob needs to update his master with origin/master
522. Switch to master
523. Switch to master
524. Move code from Remote to Local Move code from remote repo to local repo
525. Name of remote Move code from Remote to Local
526. Name of branch Move code from Remote to Local
528. 011101001010010010100100101 000100101010101010101011010 111010010010010001010101010
529. It worked! Move code from Remote to Local
530. Understanding git history
531. Log as graph
532. Log as graph
533. Log as graph jacob_grimm/big_bad_ogre has commits
534. jacob_grimm/big_bad_ogre has commits Log as graph
535. jacob_grimm/big_bad_ogre has commits Log as graph
536. jacob_grimm/big_bad_ogre has commits Log as graph
537. jacob_grimm/big_bad_ogre has commits Log as graph
538. jacob_grimm/big_bad_ogre has commits Log as graph
539. jacob_grimm/big_bad_ogre has commits Log as graph
540. jacob_grimm/big_bad_ogre has commits Log as graph
541. origin/master and master have commits Log as graph
542. origin/master and master have commits Log as graph
543. origin/master and master have commits Log as graph
544. origin/master and master have commits Log as graph
545. origin/master and master have commits Log as graph
546. origin/master and master have commits Log as graph
547. origin/master and master have commits Log as graph
548. jacob_grimm/body has commits Log as graph
549. jacob_grimm/body has commits Log as graph
550. jacob_grimm/body has commits Log as graph
551. jacob_grimm/body has commits Log as graph
552. jacob_grimm/body has commits Log as graph
553. Jacob finished ! and hates it. It’s never merged with master. jacob_grimm/The BIg_Bad_Ogre
554. Jacob finished ! and hates it. It’s never merged with master. jacob_grimm/The BIg_Bad_Ogre
555. Jacob finished ! and hates it. He never merged into master. jacob_grimm/The BIg_Bad_Ogre
556. lost with time. The BIg_Bad_Ogre Little Red Riding Hood and
558. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
559. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
560. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
561. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
562. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
563. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
564. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
565. What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase
566. 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