Switching to Git – Why and How (ConFoo 2014)

Git is an amazing tool for making software. Are you wondering what the fuss is about?

If you're currently using another system, and are thinking of making a switch to Git, this is the talk for you. Find out what it is that makes Git so attractive to developers, and how it can help with deployment, ops, and testing.

Transcript

1. Switching to Why & How
3. ! ben " benstraub
8. h p://redmonk.com/sogrady/2013/12/19/dvcs-and-git-2013/ CVS -16% SVN -13% git +30%
9. Why & How
10. SCCS Local Files Only
11. CVS …But With Network
12. SVN …But With Branching
29. git WHOA
30. Workflow
31. # file1 blah blah blah work for feature A blah blah work for feature B # file2 blah blah blah work for feature B blah blah work for feature A
32. # file1 blah blah blah work for feature A blah blah work for feature B # file2 blah blah blah work for feature B blah blah work for feature A
33. r7 | ben | 2014-01-15 19:04:14 -08 ! stuff
34. # file1 blah blah blah work for feature A blah blah work for feature B # file2 blah blah blah work for feature B blah blah work for feature A
35. # file1 blah blah blah work for feature A blah blah # file2 blah blah blah blah blah work for feature A
36. # file1 blah blah blah work for feature A blah blah # file2 blah blah blah blah blah work for feature A
37. # file1 blah blah blah work for feature A blah blah wrok for feture B # file2 blah blah blah mayk feetchur B blah blah work for feature A
38. # file1 blah blah blah work for feature A blah / fix #7 blah wrok for feture B # file2 blah blah / fix #2 blah mayk feetchur B blah blah work for feature A
39. # file1 blah blah blah work for feature A blah blah work for feature B # file2 blah blah blah work for feature B blah blah work for feature A
40. # file1 blah blah blah work for feature A blah blah work for feature B # file2 blah blah blah work for feature B blah blah work for feature A
41. # file1 blah blah blah work for feature A blah blah work for feature B # file2 blah blah blah work for feature B blah blah work for feature A
42. Mindflow
43. clone/checkout svn: 5.3s git: 14.5s Size on disk svn: 5.5 MB git: 21 MB JQuery
44. log (10 entries) svn: 1.2s git: 0.008s show svn: 6.2s git: .009s 150x faster 689x faster commit svn: 44s git: 0.2s 220x faster
45. Shared Repository Developer Developer Developer
46. Shared Repository Developer Developer Developer X
48. Shared Repository Developer Developer Developer X
49. Shared Repository Developer Developer Developer X Temp Repository
50. Shared Repository Developer Developer Developer X Temp Repository
52. Capability
53. But… What will I miss?
54. Why & How
55. Why & How
56. 1. Migrate Your Data
57. SVN !/nirvdrum/svn2git
58. Authors File cvorca ben l33rj3t17 bob johnnyappleseed employee27451
59. Authors File cvorca ben l33rj3t17 bob johnnyappleseed employee27451 cvorca <cvorca@1F800880-4661-4327-91 ben <ben@667A2361-E072-466A-B718-C1C l33rj3t17 <l33rj3t17@C57B291D-641B-4 bob <bob@548E9AC8-FE11-442C-8D0D-C74 johnnyappleseed <johnnyappleseed@F3E employee27451 <employee27451@C4DEE07
60. Authors File cvorca ben l33rj3t17 bob johnnyappleseed employee27451 Joan Cleaver <cvorca@bigco.com> Ben Kingsley <ben@bigco.com> Steven Spielberg <l33rj3t17@bigco.co Bob Newhart <bob@bigco.com> Johnny Depp <johnnyappleseed@bigco.c Kevin Bacon <employee27451@bigco.com
61. TFS h p://git-tfs.com/
62. Perforce git-p4
63. Others h p://www.lmgtfy.com/?q=migrate +to+git+from+
64. Others git fast-import
65. 2. Put It Somewhere Safe
66. #
68. 3. Get To Work
69. Install Git h p://git-scm.com
70. GitHub Windows
71. Introduce Yourself git config --global user.name “Tom Jones” git config --global user.email “tom@bigco.com”
72. ›❯ mkdir newrepo; cd newrepo ›❯ git init Initialized empty Git repository in /tmp/newrepo/.git/ ›❯ ls -a . .. .git ›❯ Make a Repository
73. ›❯ mkdir newrepo; cd newrepo ›❯ git init Initialized empty Git repository in /tmp/newrepo/.git/ ›❯ ls -a . .. .git ›❯ Make a Repository
74. ›❯ mkdir newrepo; cd newrepo ›❯ git init Initialized empty Git repository in /tmp/newrepo/.git/ ›❯ ls -a . .. .git ›❯ Make a Repository
75. Clone a Repository ›❯ git clone https://github.com/jquery/jquery Cloning into 'jquery'... remote: Reusing existing pack: 32101, done. remote: Total 32101 (delta 0), reused 0 (delta 0) Receiving objects: 100% (32101/32101), 17.69 MiB | 1.04 MiB/ done. Resolving deltas: 100% (22737/22737), done. ›❯ cd jquery ›❯ ls -a . .gitignore .travis.yml bower.json .. .jscs.json AUTHORS.txt build .bowerrc .jshintignore CONTRIBUTING.md package.json
76. Clone a Repository ›❯ git clone https://github.com/jquery/jquery Cloning into 'jquery'... remote: Reusing existing pack: 32101, done. remote: Total 32101 (delta 0), reused 0 (delta 0) Receiving objects: 100% (32101/32101), 17.69 MiB | 1.04 MiB/ done. Resolving deltas: 100% (22737/22737), done. ›❯ cd jquery ›❯ ls -a . .gitignore .travis.yml bower.json .. .jscs.json AUTHORS.txt build .bowerrc .jshintignore CONTRIBUTING.md package.json
77. Clone a Repository ›❯ git clone https://github.com/jquery/jquery Cloning into 'jquery'... remote: Reusing existing pack: 32101, done. remote: Total 32101 (delta 0), reused 0 (delta 0) Receiving objects: 100% (32101/32101), 17.69 MiB | 1.04 MiB/ done. Resolving deltas: 100% (22737/22737), done. ›❯ cd jquery ›❯ ls -a . .gitignore .travis.yml bower.json .. .jscs.json AUTHORS.txt build .bowerrc .jshintignore CONTRIBUTING.md package.json
78. remote: Reusing existing pack: 32101, done. remote: Total 32101 (delta 0), reused 0 (delta 0) Receiving objects: 100% (32101/32101), 17.69 MiB | 1.04 MiB/ done. Resolving deltas: 100% (22737/22737), done. ›❯ cd jquery ›❯ ls -a . .gitignore .travis.yml bower.json .. .jscs.json AUTHORS.txt build .bowerrc .jshintignore CONTRIBUTING.md package.json .editorconfig .jshintrc Gruntfile.js speed .git .mailmap MIT-LICENSE.txt src .gitattributes .npmignore README.md test
79. Do Some Work ›❯ git checkout -b new-feature Switched to a new branch 'new-feature' ›❯ echo “awesome stuff” >> main.c ›❯ git gui &
80. Do Some Work ›❯ git checkout -b new-feature Switched to a new branch 'new-feature' ›❯ echo “awesome stuff” >> main.c ›❯ git gui &
81. Do Some Work ›❯ git checkout -b new-feature Switched to a new branch 'new-feature' ›❯ echo “awesome stuff” >> main.c ›❯ git gui &
82. Do Some Work ›❯ git checkout -b new-feature Switched to a new branch 'new-feature' ›❯ echo “awesome stuff” >> main.c ›❯ git gui &
83. Do Some Work
84. Do Some Work
85. Do Some Work
86. Do Some Work git add main.c
87. Do Some Work git commit
88. Do Some Work ›❯ git checkout -b new-feature Switched to a new branch 'new-feature' ›❯ echo “awesome stuff” >> main.c ›❯ git gui & ›❯ git log --oneline bd7b055 Add awesome new feature!!1!! 34c5978 Initial commit
89. Do Some Work ›❯ git checkout -b new-feature Switched to a new branch 'new-feature' ›❯ echo “awesome stuff” >> main.c ›❯ git gui & ›❯ git log --oneline bd7b055 Add awesome new feature!!1!! 34c5978 Initial commit
90. Do Some Work ›❯ git checkout -b new-feature Switched to a new branch 'new-feature' ›❯ echo “awesome stuff” >> main.c ›❯ git gui & ›❯ git log --oneline bd7b055 Add awesome new feature!!1!! 34c5978 Initial commit
91. Give To Others
92. Give To Others
93. Give To Others ›❯ git remote add origin https://github.com/mycorp/projec ›❯ git push -u origin new-feature Counting objects: 6, done. Delta compression using up to 8 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 451 bytes, done. Total 6 (delta 1), reused 0 (delta 0) To https://github.com/mycorp/project.git * [new branch] new-feature -> new-feature ›❯ # more work
94. Give To Others ›❯ git remote add origin https://github.com/mycorp/projec ›❯ git push -u origin new-feature Counting objects: 6, done. Delta compression using up to 8 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 451 bytes, done. Total 6 (delta 1), reused 0 (delta 0) To https://github.com/mycorp/project.git * [new branch] new-feature -> new-feature ›❯ # more work
95. ›❯ git remote add origin https://github.com/mycorp/projec ›❯ git push -u origin new-feature Counting objects: 6, done. Delta compression using up to 8 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 451 bytes, done. Total 6 (delta 1), reused 0 (delta 0) To https://github.com/mycorp/project.git * [new branch] new-feature -> new-feature ›❯ # more work ›❯ git push Counting objects: 5, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 263 bytes, done.
96. ›❯ git remote add origin https://github.com/mycorp/projec ›❯ git push -u origin new-feature Counting objects: 6, done. Delta compression using up to 8 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 451 bytes, done. Total 6 (delta 1), reused 0 (delta 0) To https://github.com/mycorp/project.git * [new branch] new-feature -> new-feature ›❯ # more work ›❯ git push Counting objects: 5, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 263 bytes, done.
97. Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 451 bytes, done. Total 6 (delta 1), reused 0 (delta 0) To https://github.com/mycorp/project.git * [new branch] new-feature -> new-feature ›❯ # more work ›❯ git push Counting objects: 5, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 263 bytes, done. Total 3 (delta 1), reused 0 (delta 0) To https://github.com/ben/temp.git bd7b055..0adf488 new-feature -> new-feature
98. Take From Others
99. Take From Others ›❯ git branch master * new-feature ›❯ git branch -a master * new-feature remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/new-feature ›❯ git fetch
100. Take From Others ›❯ git branch master * new-feature ›❯ git branch -a master * new-feature remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/new-feature ›❯ git fetch
101. Take From Others ›❯ git branch master * new-feature ›❯ git branch -a master * new-feature remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/new-feature ›❯ git fetch
102. Take From Others ›❯ git branch master * new-feature ›❯ git branch -a master * new-feature remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/new-feature ›❯ git fetch remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0)
103. Take From Others ›❯ git branch master * new-feature ›❯ git branch -a master * new-feature remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/new-feature ›❯ git fetch remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0)
104. * new-feature ›❯ git branch -a master * new-feature remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/new-feature ›❯ git fetch remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From https://github.com/mycorp/project bd7b055..c88ae4b master -> origin/master ›❯ git merge origin/master -m 'Merging upstream work' Auto-merging main.c Merge made by the 'recursive' strategy. main.c | 1 +
105. * new-feature ›❯ git branch -a master * new-feature remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/new-feature ›❯ git fetch remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From https://github.com/mycorp/project bd7b055..c88ae4b master -> origin/master ›❯ git merge origin/master -m 'Merging upstream work' Auto-merging main.c Merge made by the 'recursive' strategy. main.c | 1 +
106. remotes/origin/new-feature ›❯ git fetch remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From https://github.com/mycorp/project bd7b055..c88ae4b master -> origin/master ›❯ git merge origin/master -m 'Merging upstream work' Auto-merging main.c Merge made by the 'recursive' strategy. main.c | 1 + 1 file changed, 1 insertion(+) ›❯ git push newrepo2/git/new-feature Counting objects: 7, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done.
107. remotes/origin/new-feature ›❯ git fetch remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From https://github.com/mycorp/project bd7b055..c88ae4b master -> origin/master ›❯ git merge origin/master -m 'Merging upstream work' Auto-merging main.c Merge made by the 'recursive' strategy. main.c | 1 + 1 file changed, 1 insertion(+) ›❯ git push newrepo2/git/new-feature Counting objects: 7, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done.
108. Auto-merging main.c Merge made by the 'recursive' strategy. main.c | 1 + 1 file changed, 1 insertion(+) ›❯ git push newrepo2/git/new-feature Counting objects: 7, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 305 bytes, done. Total 3 (delta 1), reused 0 (delta 0) To /tmp/newrepo 0adf488..68f178c new-feature -> new-feature
109. commit merge merge fetch 4. Collaborate branch
110. 5. Migrate Your Habits
111. “Branching is Hard.” – Mahatma Gandhi
112. “No, wait. Merging is Hard.” – Mahatma Gandhi
113. “I hate the command line.” – Stephen Harper
114. “Our repository is too big.” – Big Bird
115. “How do you lock files?” – Bruce Springsteen
116. “What about permissions?” – Luke Skywalker
117. $
118. Workflow Mindflow Capability Why & How Migrate Your Data Put it Somewhere Safe Migrate Your Habits
119. Switching to http://git.io/dGvy1w