Git Empowered
2 likes379 views
This document outlines an agenda for a talk about using Git. The talk is broken into three parts: messing with commits, everyday workflows, and what to do when Git problems happen. It provides terminology for Git concepts like repository, commit, branch and HEAD. It also summarizes common Git commands and workflows like add, commit, log, status, cherry-pick and GitHub flow. Troubleshooting techniques like reflog and bisect are also mentioned.
Git Empowered
- 4. THE TALK IS BROKEN INTO THREE PARTS… JMac AGENDA
- 8. EACH PART WILL BE ROUGHLY 15 MINUTES WITH A QUICK DEMO IN BETWEEN. JMac AGENDA
- 9. I BELIEVE IN USING GIT VIA THE COMMAND LINE. JMac FORMAT
- 10. BECAUSE GIT IS POWERFUL AND IT’S BEST TO YIELD THAT POWER DIRECTLY. JMac FORMAT
- 11. OPEN A TERMINAL UNIX BASED SYSTEM
- 14. GIT BASH WINDOWS < 10
- 15. GIT EMPOWERED GIT TERMINOLOGY ▸ repository or repo ▸ commit ▸ SHA or hash ▸ history or tree ▸ branch ▸ HEAD
- 16. GIT EMPOWERED VISUALIZING THE TERMINOLOGY commit tree c45fb1e 7df5edb f88d321 be584f3 HEAD branch 203ecc1
- 18. add + commit
- 19. git add .
- 20. git commit -am
- 22. git add -p
- 23. git add -i
- 25. DEMO
- 26. commit --amend
- 27. commit --squash
- 28. commit --fixup
- 29. rebase -i
- 31. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 3 4 1
- 32. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 3 4 1 fixup + squash
- 33. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 + 3 1 rebase --autosquash
- 34. DEMO
- 35. git cherry-pick
- 36. GIT EMPOWERED VISUALIZING THE COMMANDS master 203ecc1
- 37. GIT EMPOWERED VISUALIZING THE COMMANDS master 203ecc1 f88d321 cherry-pick
- 38. ONCE YOU’VE “SHARED” YOUR WORK, REWRITING HISTORY IS A VERY DANGEROUS THING. JMac AGENDA
- 40. git logo
- 42. gst
- 43. git status
- 52. DEMO
- 53. WHEN GIT HAPPENS… PART 3
- 55. reflog
- 56. GIT EMPOWERED VISUALIZING THE COMMANDS reflog c45fb1e 7df5edb f88d321 be584f3
- 57. bisect
- 59. WHEN ALL ELSE FAILS, JUST MAKE A BRANCH TO SERVE AS A BACKUP. JMac AGENDA
- 60. DEMO
- 61. QUESTIONS
- 62. FOLLOW ME ON TWITTER AND EMAIL ME FOR A COUPON FOR THE “GETTING GIT” SCREENCASTS. JMac - @gonedark - jason@pureconcepts.net THANKS