Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Save Time, Money, and Tears With Git

Marc Kalmes
February 23, 2015

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.

Marc Kalmes

February 23, 2015
Tweet

More Decks by Marc Kalmes

Other Decks in Programming

Transcript

  1. COCOAHEADS KÖLN 23. Feb 2015

  2. HI!

  3. MARC KALMES

  4. None
  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

  17. None
  18. None
  19. None
  20. None
  21. None
  22. None
  23. None
  24. None
  25. None
  26. None
  27. SAVE WORK IN PROGRESS

  28. None
  29. None
  30. None
  31. None
  32. None
  33. None
  34. None
  35. KEEPING THINGS CLEAN

  36. None
  37. None
  38. None
  39. None
  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

  46. None
  47. None
  48. None
  49. None
  50. None
  51. None
  52. None
  53. UNDO RANGE OF COMMITS

  54. None
  55. None
  56. None
  57. None
  58. None
  59. None
  60. UNDO MERGE-COMMIT

  61. None
  62. None
  63. None
  64. None
  65. None
  66. None
  67. None
  68. None
  69. None
  70. None
  71. None
  72. None
  73. None
  74. None
  75. None
  76. None
  77. None
  78. None
  79. HOW TO DO IT

  80. None
  81. None
  82. None
  83. None
  84. None
  85. None
  86. None
  87. None
  88. None
  89. None
  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

  96. None
  97. None
  98. None
  99. None
  100. None
  101. None
  102. None
  103. None
  104. None
  105. None
  106. None
  107. None
  108. VALIDATE COMMITS

  109. None
  110. None
  111. None
  112. None
  113. None
  114. None
  115. None
  116. None
  117. None
  118. None
  119. AGENDA • reset • revert • rebase

  120. AGENDA • reset • revert • rebase

  121. THANK YOU!

  122. Q&A http://mkalmes.net https://twitter.com/mkalmes