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

Git With Confidence - RailsConf 2019 Workshop

Git With Confidence - RailsConf 2019 Workshop

Slides used with the "Mastering Git - Learn What's Inside to Git With Confidence" workshop presented at RailsConf 2019.

299aff498e2165845798849ca52ff9f8?s=128

Chris Toomey

May 01, 2019
Tweet

Transcript

  1. Git with Confidence @christoomey | thoughtbot

  2. Chris Toomey @christoomey @_bikeshed

  3. Git with Confidence @christoomey | thoughtbot

  4. Git with Confidence I - Objects II - Opera)ons III

    - Examples @christoomey | thoughtbot
  5. ctoomey.com/git @christoomey | thoughtbot

  6. @christoomey | thoughtbot

  7. @christoomey | thoughtbot

  8. @christoomey | thoughtbot

  9. @christoomey | thoughtbot

  10. @christoomey | thoughtbot

  11. @christoomey | thoughtbot

  12. @christoomey | thoughtbot

  13. @christoomey | thoughtbot

  14. @christoomey | thoughtbot

  15. @christoomey | thoughtbot

  16. @christoomey | thoughtbot

  17. @christoomey | thoughtbot

  18. @christoomey | thoughtbot

  19. @christoomey | thoughtbot

  20. @christoomey | thoughtbot

  21. @christoomey | thoughtbot

  22. @christoomey | thoughtbot

  23. @christoomey | thoughtbot

  24. @christoomey | thoughtbot

  25. @christoomey | thoughtbot

  26. @christoomey | thoughtbot

  27. @christoomey | thoughtbot

  28. @christoomey | thoughtbot

  29. @christoomey | thoughtbot

  30. @christoomey | thoughtbot

  31. @christoomey | thoughtbot

  32. @christoomey | thoughtbot

  33. @christoomey | thoughtbot

  34. @christoomey | thoughtbot

  35. @christoomey | thoughtbot

  36. @christoomey | thoughtbot

  37. @christoomey | thoughtbot

  38. @christoomey | thoughtbot

  39. @christoomey | thoughtbot

  40. @christoomey | thoughtbot

  41. @christoomey | thoughtbot

  42. @christoomey | thoughtbot

  43. Git objects are immutable @christoomey | thoughtbot

  44. @christoomey | thoughtbot

  45. @christoomey | thoughtbot

  46. @christoomey | thoughtbot

  47. @christoomey | thoughtbot

  48. @christoomey | thoughtbot

  49. @christoomey | thoughtbot

  50. Func%onal Core, Impera%ve Shell @christoomey | thoughtbot

  51. @christoomey | thoughtbot

  52. "commit-ish" & "tree-ish" @christoomey | thoughtbot

  53. @christoomey | thoughtbot

  54. II - Git Opera,ons @christoomey | thoughtbot

  55. git commit @christoomey | thoughtbot

  56. @christoomey | thoughtbot

  57. @christoomey | thoughtbot

  58. @christoomey | thoughtbot

  59. @christoomey | thoughtbot

  60. @christoomey | thoughtbot

  61. @christoomey | thoughtbot

  62. @christoomey | thoughtbot

  63. git merge @christoomey | thoughtbot

  64. @christoomey | thoughtbot

  65. @christoomey | thoughtbot

  66. @christoomey | thoughtbot

  67. git merge (w/ merge commit) @christoomey | thoughtbot

  68. @christoomey | thoughtbot

  69. @christoomey | thoughtbot

  70. @christoomey | thoughtbot

  71. @christoomey | thoughtbot

  72. @christoomey | thoughtbot

  73. @christoomey | thoughtbot

  74. rebase @christoomey | thoughtbot

  75. @christoomey | thoughtbot

  76. @christoomey | thoughtbot

  77. @christoomey | thoughtbot

  78. @christoomey | thoughtbot

  79. @christoomey | thoughtbot

  80. @christoomey | thoughtbot

  81. @christoomey | thoughtbot

  82. @christoomey | thoughtbot

  83. @christoomey | thoughtbot

  84. @christoomey | thoughtbot

  85. interac(ve rebase @christoomey | thoughtbot

  86. @christoomey | thoughtbot

  87. @christoomey | thoughtbot

  88. @christoomey | thoughtbot

  89. @christoomey | thoughtbot

  90. @christoomey | thoughtbot

  91. @christoomey | thoughtbot

  92. @christoomey | thoughtbot

  93. @christoomey | thoughtbot

  94. @christoomey | thoughtbot

  95. checkout a file from another branch @christoomey | thoughtbot

  96. @christoomey | thoughtbot

  97. @christoomey | thoughtbot

  98. @christoomey | thoughtbot

  99. @christoomey | thoughtbot

  100. @christoomey | thoughtbot

  101. @christoomey | thoughtbot

  102. @christoomey | thoughtbot

  103. @christoomey | thoughtbot

  104. @christoomey | thoughtbot

  105. III - Examples @christoomey | thoughtbot

  106. Next Steps @christoomey | thoughtbot

  107. Next Steps • ABC -> Always Be Commi1ng @christoomey |

    thoughtbot
  108. Next Steps • ABC -> Always Be Commi1ng • reflog

    has your back @christoomey | thoughtbot
  109. Next Steps • ABC -> Always Be Commi1ng • reflog

    has your back • Revisit the content with the Mastering Git course on Upcase (free!) @christoomey | thoughtbot