Git, an Illustrated Primer
3 likes1,707 views
This document provides an overview of the basics of using Git, including installing Git, creating repositories, staging and committing files, branching and merging, and working with remote repositories by pushing and pulling changes. It discusses concepts like the working directory, index, and repository, and commands for common tasks like adding, committing, branching, merging, stashing, and resetting changes. It also covers more advanced topics like rebasing interactive commits, squashing commits, and undoing commits.
Git, an Illustrated Primer
- 1. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com GIT: An Illustrated Primer
- 2. http://mojolive.com/profile/dcousineau Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 3. History Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 4. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com BitKeeper No Longer Free To Use Linux Kernel Requires Distributed Performant SVN and CVS... Not So Much “CVS is what we should NOT do...”
- 5. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com GIT thus,
- 6. gItting started Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 7. +Linux Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> sudo apt-get install git $> sudo yum install git $> echo "Seriously?"
- 8. +OSX Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com http://git-scm.com
- 9. +OSX Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> ruby <(curl -fsSkL raw.github.com/mxcl/homebrew/go) $> brew install git $> say "Win!"
- 10. +Windows Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com http://windows.github.com
- 11. +Gitting STarted Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 12. +My First Repo Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 13. +Stage New Files Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 14. +Commit Staging Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 15. +staging? Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com working directory index repository
- 16. +staging? Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com working directory index repository “staging”
- 17. +staging? Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com working directory index repository modify
- 18. +staging? Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com working directory index repository git add
- 19. +staging? Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com working directory index repository git commit
- 20. +Directories Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 21. +Modify Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 22. +Branch! Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 23. +Back to Master Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 24. +Merge! Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 25. +stashing Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 26. +Popping Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 27. branching Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 28. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com a b c MASTER HEAD
- 29. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com a b c MASTER DEVELOP create new branch HEAD
- 30. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com a b c MASTER DEVELOP Checkout new branch HEAD
- 31. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com a b c MASTER DEVELOP commit to develop d HEAD
- 32. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com commit to master HEAD a b c MASTER DEVELOP d e
- 33. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com a b c MASTER DEVELOP merge Develop d e f
- 34. Remote Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 35. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com SVN GIT d e b a c d e b a c d d e b a c
- 36. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 37. +Create a Project Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 38. +Create a Project Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 39. +Doing as I am told Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 40. +did as I was told Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 41. +Push Again! Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 42. +Fetching & Merging Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 43. +Pulling Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 44. +Two Authors Two Pushes Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 45. +Two Authors Two Pushes Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 46. +AFtermath Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 47. +Aftermath Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 48. +Aftermath Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 49. +AFtermath Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 50. +forking Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 51. +pull requests Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 52. +MAke Changes IN A NEW BRANCH Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 53. +Push Changes Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 54. +See Our New Branch Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 55. +Create Pull Request Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 56. +Oh Look, Our Pull Request Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 57. +Oh Look Our Pull Request Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 58. +Oh Look, It’s Merged In! Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 59. +Remotes Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 60. +Adding Another Remote Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 61. +create and sync new branches Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 62. +Delete local and remote branches Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 63. +Pull From One, Push To Another Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 64. GIT FLow Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 66. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 67. Subversion and GIT Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 68. +et voilà Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git svn clone -s -r 1000:HEAD https://url/to/repo ./wkngcpy $> git svn show-ignore > .gitignore
- 69. +Workflow Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com Normal GIT Workflow
- 70. +Sync Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git svn dcommit --dry-run $> git svn dcommit $> git svn rebase
- 71. +With some caveats Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com anything that has been dcommit’d is set in stone! do. not. touch. git branches well svn... not so much
- 72. +Local Branching Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git merge --squash branch
- 73. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com git merge --squash localbrn HEAD a b c MASTER localbrn d e
- 74. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com git merge --squash localbrn HEAD a b MASTER DEC
- 75. +Why? Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com SVN is TERRIBLE at merges git-svn will do it if you don’t and when it fails, it does so spectacularly you’ll just litter your commit history
- 76. +tracking svn branches Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git checkout -t remotes/branchname
- 77. +creating remote branches Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git svn branch -m “Creating new branch” branchname $> git checkout -t remotes/branchname
- 78. +personal opinion Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com except for release tagging and a develop branch don’t bother with remote branching just stick to local and squashes
- 79. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com use git svn locally push for team adoption procure git server full clone push to new git server
- 80. Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com use git svn locally push for team adoption procure git server full clone push to new git server
- 81. Advanced Usage Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 82. +reset my local changes Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git checkout -- . tell git “no more options!”
- 83. +Replay Last commit Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git reset --mixed REF
- 84. +Gitting Ready Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 85. +Results Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 86. +Undo Last commit Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git reset --hard HEAD^ HEAD^ means commit prior to HEAD. HEAD^2 is 2 commits prior, etc etc.
- 87. +“Oops i forgot to branch” Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git branch newbranchname $> git reset --hard SHA commit immediately before the intended first commit of our new branch
- 88. +“Oops i forgot to branch” Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 89. +“Oops i forgot to branch” Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 90. +“Oops I accidentally the commit message” Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git rebase --interactive SHA commit immediately preceding the commit in question
- 91. +Oops Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 92. +Lay of the land Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 93. +Making decisions Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 94. +Reach 88MPH Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 95. +Fun with Paradoxes Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 96. +Fruits of our labor Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 97. +“Oops I committed the private key” Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com $> git filter-branch --index-filter 'git rm --cached --ignore-unmatch secret.key' --prune-empty --tag-name-filter cat -- --all ಠ_ಠ
- 98. +Terrible Mistake Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 99. +gone now, here yesterday Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 100. +VooDoo Magic Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 101. +Results Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 102. +Cleanup The Mess Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 103. +Look Ma, No secret.key! Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 104. THANKS.FOR YOUR ATTENTION Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
- 105. +further resources Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com http://git-scm.com/book FREE! Attribution-NonCommercial-ShareAlike 3.0 Unported https://help.github.com