Git Going with DVCS v1.6.0
•
7 j'aime•1,339 vues
Git is a distributed version control system that allows developers to work offline and collaborate easily. It uses a directed acyclic graph and SHA-1 hashes to store changes efficiently. Developers can create branches, merge, and rebase code easily. Git also integrates well with Subversion for migration purposes.
Recommandé
Contenu connexe
Tendances
En vedette
En vedette (17)
Similaire à Git Going with DVCS v1.6.0
Similaire à Git Going with DVCS v1.6.0 (20)
Plus de Matthew McCullough
Plus de Matthew McCullough (20)
Dernier
Dernier (20)
Git Going with DVCS v1.6.0
- 1. Git going with DVCS nutes oc 90 mi ol magi f source code contr by Matthew McCullough of Ambient Ideas, LLC
- 6. http://www.wakaleo.com/books/continuous- integration-with-hudson-the-book
- 8. Git
- 9. “Cool kids” version control system
- 10. Open Source
- 11. bash scripts C code
- 12. ≉
- 14. “ Git -noun asa nt ish Sla ng. an u nple Brit er son” cont empt ible p or English D ictionar y -Oxford
- 16. otistical b astard, and “ I'm an eg I name all my projects after myself. Fi rst Linux, now git. ” -Lin us Torvalds
- 19. 145+ commands
- 20. 18 used on a daily basis
- 21. init checkout bisect log revert clone rebase pack diff merge pull grep commit push tag add status branch
- 22. Distributed Version Control A new idea?
- 23. 1997 code co-op
- 24. 2001 arch
- 25. 2003 monotone
- 26. 2003 SVK
- 27. 2003 darcs
- 28. 2005 bazaar
- 29. 2005 mercurial
- 30. 2005 git
- 31. Why?
- 32. m s ste l sy tro Subversion on n c rsio Perforce veSource d Clear ize Safe Case a l CVS t r PVCS e n RCS C Folders
- 33. “ hated it with a p assion... ...no w ay to do C VS right. -Linu s Torvalds ”
- 34. Why switch to Git ?
- 35. Safely Be Wrong Experiment Innovate Drive-by Assist Crowd Source
- 37. and...
- 40. Hashes and Git
- 41. Index vs Hash ‣ Centralized VCS uses DB sequential index.
- 42. Index vs Hash ‣ Git uses SHA-1 hash.
- 45. use as little of it as is unique
- 48. treeish
- 49. treeish = shorthand for hashes
- 50. 9AB223
- 51. 9AB223^
- 52. HEAD
- 53. HEAD^
- 54. HEAD~3
- 56. 9AB223..56CD77
- 57. Hashable Objects ‣ Blob ‣ Tree ‣ Commit ‣ Tag
- 58. 8d162 c67db commit 7e8b1 blob 7D 8D B3 7F BD 12 9F E9 a10b3 tree 7B 78 9D 3F 5C A6 72 CB tree: parent: author: a10b3 nil Fird tree blob: 8d162 logo.jpg committer: Matthew 51d22 blob: 51d22 draw.js message: Major refactoring tree: blob: 7e8b1 web 9ab16 index.html blob of the web content. //Some more javascript 9ab16 var renderSize <html> blob <body></body> </html>
- 60. developer A
- 61. developer A developer B
- 62. developer A developer B
- 63. developer A developer B
- 64. blessed repo developer A developer B
- 66. Working Staging Repo checkout add commit Three stage thinking
- 67. Remote Stash Repo Index Working
- 68. Remote Stash Repo Index Working
- 69. Remote Stash Repo git clone Index Working
- 70. Remote Stash Repo git clone git checkout Index Working
- 71. Remote Stash Repo git clone git checkout edit project files Index Working
- 72. Remote Stash Repo git clone git checkout edit project files boss interrupts git stash Index Working
- 73. Remote Stash Repo git clone git checkout edit project files boss interrupts git stash test bug on master Index working as designed Working
- 74. Remote Stash Repo git clone git checkout edit project files boss interrupts git stash test bug on master Index working as designed git stash apply Working
- 75. Remote Stash Repo git clone git checkout edit project files boss interrupts git stash test bug on master Index working as designed git stash apply Working git add
- 76. Remote Stash Repo git clone git checkout edit project files boss interrupts git stash test bug on master Index working as designed git stash apply Working git add git commit
- 77. Remote Stash Repo git clone git checkout edit project files boss interrupts git stash test bug on master Index working as designed git stash apply Working git add git commit git push
- 78. WorkingOffline
- 81. More demand to work without connectivity
- 82. More demand to work without connectivity
- 84. Offline Anything Checkin Add Branch List change log Grep history Rewrite history Stash Merge Label Remove practically everything but push
- 85. Offline Anything Checkin Add Branch List change log Grep history Rewrite history Stash Merge Label Remove practically everything but push
- 87. Matthew: Cool! Another commit to my latest OSS project using Git!
- 88. Matthew: Cool! Another commit to my latest OSS project using Git! Madelaine: I like subversion much better...
- 90. Typical SCMs use deltas
- 91. v1 v2 v3 v4 v5 File A File A File A File B File B File B File B File B File C File C Storage
- 92. CVS / Subversion / darcs / Mercurial
- 94. Checkin ckin kin in Chec kin he ck ec C he in in Ch C ck k C he h ec kin C ec ec kin Delta storage gets slower as the hhistory Ch C Checkin of a file gets longer Checkin
- 95. Git uses Directed Acyclic Graph storage (DAG)
- 96. cp -r srcfolder srcfolder.prev
- 97. Copy of the entire tree per checkin
- 99. zlib deflates every blob at commit
- 100. symlinks to existing identical blobs
- 101. v1 v2 v3 v4 v5 File A File A File A File A File A File B File B File B File B File B File C File C File C File C File C Storage
- 102. 400MB Subversion repo convert to a 70MB Git repo
- 103. Speed
- 105. Init Add Status Diff Branch (Cold/Hot) git hg bzr git hg bzr git hg bzr git hg bzr Tag Log Commit (Lg) Commit (Sm) git c git h hg c hg h bzr c bzr h git hg bzr git hg bzr git hg bzr git hg bzr data from http://whygitisbetterthanx.com/#git-is-fast
- 106. Init Status Diff Branch git svn git svn git svn Tag Log Commit (Lg) Commit (Sm) git c svn c git svn git svn git svn git svn data from http://whygitisbetterthanx.com/#git-is-fast
- 107. 10 to 100 times Faster
- 108. Branch, Merge & Rebase
- 109. Branch
- 110. Cheap Branches git branch newbranch
- 111. Merge
- 112. Merges lump branch changes into a new unified commit
- 113. M da S er r ta g d n e Master/Trunk/MainLatest a32
- 114. ard d n e ta g a32 Bra n ch S er Master/Trunk/MainLatest d19 M 2e2 e69 8b3 erge M d19 9f1 e69
- 115. Merge Anything git merge --no-commit <sourcebranch>
- 116. Merge Anything git merge --squash <sourcebranch>
- 117. Merge Anything git merge <sourcebranch1> <sourcebranch2>
- 118. Rebase
- 119. Not a merge
- 120. simulates team members taking turns working (one person at a time)
- 121. Rebase for Clarity git checkout myfeaturebranch git rebase master
- 123. sing a32 Bra n ch eba Master/Trunk/MainLatest R 2e2 d19 8b3 e69
- 124. Master/Trunk/MainLatest a32 2e2 8b3 Bra ch n d19 e69 Rebase
- 125. Master/Trunk/MainLatest a32 2e2 8b3 Bra ch n
- 126. a32 Master/Trunk/MainLatest 2e2 8b3 Bra n ch d19' e69'
- 127. Master/Trunk/MainLatest a32 2e2 8b3 e69' d19'
- 128. Who’s Got Git?
- 134. UsageModels
- 137. Repo Blessed Dictatorship
- 138. Repo Blessed Dictatorship
- 139. Repo Blessed Dictatorship
- 140. Repo Blessed Dictatorship
- 141. Repo Blessed Dictatorship
- 142. Certified Integration Managed Development Repo Repo
- 143. Certified Integration Managed Development Repo Repo
- 144. Certified Integration Managed Development Repo Repo
- 145. Certified Integration Managed Development Repo Repo
- 146. Private Public GitHub Custom + Public Contrib
- 147. Private Public GitHub Custom + Public Contrib
- 148. Private Public Customized GitHub Custom + Public Contrib
- 149. Private Public Customized GitHub Custom + Public Contrib
- 150. SVN Interop
- 151. arguably the best feature of git
- 152. use git in stealth mode
- 153. Subversion git svn clone http://unfurl.com/trunk //Hack, hack, hack git commit -a -m‘Some changes’ git commit -a -m‘More changes’ git commit -a -m‘Final changes’ git svn dcommit
- 155. Subversion ‣ First class compatibility. ‣ Round trip support. ‣ Git commits = svn commits.
- 156. effortlessly convert full history when ready to migrate the team
- 157. Migration git svn clone http://unfurl.com/trunk
- 158. Migration You now have a full git clone of the SVN repo
- 159. Migration Power off your Subversion server
- 161. 3 reasons
- 162. Cherry Pick ! ‣git cherry-pick a5b2ee ‣Merge in just one commit.
- 163. Cherry Pick ! ‣git cherry-pick a5b2ee ‣Merge in just one commit.
- 164. Search History " ‣git grep SomeText HEAD^^^ ‣Search blob contents history without checkouts.
- 165. Search History " ‣git grep SomeText HEAD^^^ ‣Search blob contents history without checkouts.
- 166. Bisect Bugs # ‣git bisect run mvn test ‣Binary-search for bug via failed tests. ‣Manual or automated modes. ‣Ant, Maven, or shell script that can return 0 or 1-127
- 167. Bisect Bugs # ‣git bisect run mvn test ‣Binary-search for bug via failed tests. ‣Manual or automated modes. ‣Ant, Maven, or shell script that can return 0 or 1-127
- 168. Twitter @matthewmccull Matthew Blog http://www.ambientideas.com/blog sidebar has all my social media links Email matthewm@ambientideas.com GitHub http://github.com/matthewmccullough
- 169. Image Credits ‣ http://www.ambientideasphotography.com ‣ http://flickr.com/photos/lenore-m/2903856664/ ‣ http://en.wikipedia.org/wiki/Git_(software) ‣ http://flickr.com/photos/karenhorton/1583513014/ ‣ http://flickr.com/photos/mashdnart/2545782407/ ‣ http://commons.wikimedia.org/wiki/ File:Small_Boy_nuclear_test_1962.jpg ‣ http://www.flickr.com/photos/knmurphy/2506896257/ ‣ http://www.flickr.com/photos/albyspace/1022035568/ ‣ http://flickr.com/photos/michaelhays/3070238360/ ‣ http://flickr.com/photos/d_vdm/509996632/