Se ha denunciado esta presentación.
Utilizamos tu perfil de LinkedIn y tus datos de actividad para personalizar los anuncios y mostrarte publicidad más relevante. Puedes cambiar tus preferencias de publicidad en cualquier momento.

Git Empowered

228 visualizaciones

Publicado el

Slides from my talk at PHP[world] 2016 to help you feel empowered when running Git commands.

Publicado en: Tecnología
  • Sé el primero en comentar

Git Empowered

  1. 1. GIT EMPOWERED
  2. 2. THE TALK IS BROKEN INTO THREE PARTS… JMac AGENDA
  3. 3. MESSING WITH COMMITS PART 1
  4. 4. EVERYDAY WORKFLOWS PART 2
  5. 5. WHEN GIT HAPPENS… PART 3
  6. 6. EACH PART WILL BE ROUGHLY 15 MINUTES WITH A QUICK DEMO IN BETWEEN. JMac AGENDA
  7. 7. I BELIEVE IN USING GIT VIA THE COMMAND LINE. JMac FORMAT
  8. 8. BECAUSE GIT IS POWERFUL AND IT’S BEST TO YIELD THAT POWER DIRECTLY. JMac FORMAT
  9. 9. OPEN A TERMINAL UNIX BASED SYSTEM
  10. 10. PLEASE LEAVE WINDOWS
  11. 11. GIT BASH WINDOWS < 10
  12. 12. GIT EMPOWERED GIT TERMINOLOGY ▸ repository or repo ▸ commit ▸ SHA or hash ▸ history or tree ▸ branch ▸ HEAD
  13. 13. GIT EMPOWERED VISUALIZING THE TERMINOLOGY commit tree c45fb1e 7df5edb f88d321 be584f3 HEAD branch 203ecc1
  14. 14. MESSING WITH COMMITS PART 1
  15. 15. add + commit
  16. 16. git add .
  17. 17. git commit -am
  18. 18. git add -p
  19. 19. git add -i
  20. 20. DEMO
  21. 21. commit --amend
  22. 22. commit --squash
  23. 23. commit --fixup
  24. 24. rebase -i
  25. 25. rebase --autosquash
  26. 26. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 3 4 1
  27. 27. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 3 4 1 fixup + squash
  28. 28. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 + 3 1 rebase --autosquash
  29. 29. DEMO
  30. 30. git cherry-pick
  31. 31. GIT EMPOWERED VISUALIZING THE COMMANDS master 203ecc1
  32. 32. GIT EMPOWERED VISUALIZING THE COMMANDS master 203ecc1 f88d321 cherry-pick
  33. 33. ONCE YOU’VE “SHARED” YOUR WORK, REWRITING HISTORY IS A VERY DANGEROUS THING. JMac AGENDA
  34. 34. EVERYDAY WORKFLOWS PART 2
  35. 35. git logo
  36. 36. git log --oneline
  37. 37. gst
  38. 38. git status
  39. 39. GIT EMPOWERED GITHUB FLOW master feature branch
  40. 40. GIT EMPOWERED GITHUB FLOW master merge
  41. 41. GIT EMPOWERED GITHUB FLOW master feature branch
  42. 42. GIT EMPOWERED GITHUB FLOW master merge
  43. 43. GIT EMPOWERED GITHUB FLOW master feature branch
  44. 44. GIT EMPOWERED GITHUB FLOW master feature rebase
  45. 45. GIT EMPOWERED GITHUB FLOW master merge
  46. 46. DEMO
  47. 47. WHEN GIT HAPPENS… PART 3
  48. 48. reflog
  49. 49. GIT EMPOWERED VISUALIZING THE COMMANDS reflog c45fb1e 7df5edb f88d321 be584f3
  50. 50. bisect
  51. 51. WHEN ALL ELSE FAILS, JUST MAKE A BRANCH TO SERVE AS A BACKUP. JMac AGENDA
  52. 52. DEMO
  53. 53. QUESTIONS
  54. 54. FOLLOW ME ON TWITTER AND EMAIL ME FOR A COUPON FOR THE “GETTING GIT” SCREENCASTS. JMac - @gonedark - jason@pureconcepts.net THANKS

×