Save Time, Money, and Tears With Git

How to save time, money, and tears by using reset, revert, and rebase effectively and efficiently.

Presented at CocoaHeads Köln on Feb 23rd.

Transcript

1. COCOAHEADS KÖLN 23. Feb 2015
2. HI!
3. MARC KALMES
5. http://www.rheinfabrik.de
6. http://www.protokollcast.de
7. http://mkalmes.net
8. https://github.com/mkalmes
9. https://twitter.com/mkalmes
10. SAVE TIME, MONEY, AND TEARS WITH GIT
11. AGENDA • reset • revert • rebase
12. AGENDA • reset • revert • rebase
13. RESET
14. IMPACT OF RESET • Working Copy • Index/Staging Area • Repository
15. USE RESET TO… • make commits nice • save work in progress • keeping things clean
16. MAKE COMMITS NICE
27. SAVE WORK IN PROGRESS
35. KEEPING THINGS CLEAN
40. AGENDA • reset • revert • rebase
41. AGENDA • reset • revert • rebase
42. REVERT
43. IMPACT OF REVERT • Index/Staging Area • Repository
44. USE REVERT TO… • undo commit • undo range of commits • undo merge-commit
45. UNDO COMMIT
53. UNDO RANGE OF COMMITS
60. UNDO MERGE-COMMIT
79. HOW TO DO IT
90. AGENDA • reset • revert • rebase
91. AGENDA • reset • revert • rebase
92. REBASE
93. IMPACT OF REBASE • Working Copy • Index/Staging Area • Repository
94. USE IT TO… • tidy up commits • validate commits
95. TIDY UP COMMITS
108. VALIDATE COMMITS
119. AGENDA • reset • revert • rebase
120. AGENDA • reset • revert • rebase
121. THANK YOU!
122. Q&A http://mkalmes.net https://twitter.com/mkalmes