git init

Work together from anywhere to build the good stuff!

Transcript

1. git init work together from anywhere to build the good stuff Ralph Cowling (@_ralph)
2. WHAT?
3. WHAT?
4. WHAT? Distributed version control system
5. WHAT? Distributed version control system Developed ~2005 by Linus Torvalds
6. WHAT? Distributed version control system Developed ~2005 by Linus Torvalds Free software (GNU(2) license)
7. Distributed version control system Developed ~2005 by Linus Torvalds Free software (GNU(2) license) version control
8. Version Control
9. TOTALLY SCIENTIFIC VERSION CONTROL PAIN SCALE Version Control
10. TOTALLY SCIENTIFIC VERSION CONTROL PAIN SCALE git m ercurial bazaar suberversion
 (svn) concurrent
 version 
 system (cvs) perforce visual
 source
 safe PAIN Version Control
11. TOTALLY SCIENTIFIC VERSION CONTROL PAIN SCALE git m ercurial bazaar suberversion
 (svn) concurrent
 version 
 system (cvs) perforce visual
 source
 safe PAIN Version Control
12. TOTALLY SCIENTIFIC VERSION CONTROL PAIN SCALE git m ercurial bazaar suberversion
 (svn) concurrent
 version 
 system (cvs) perforce visual
 source
 safe PAIN Not that bad Version Control
13. TOTALLY SCIENTIFIC VERSION CONTROL PAIN SCALE git m ercurial bazaar suberversion
 (svn) concurrent
 version 
 system (cvs) perforce visual
 source
 safe PAIN Not that bad Version Control
14. TOTALLY SCIENTIFIC VERSION CONTROL PAIN SCALE git m ercurial bazaar suberversion
 (svn) concurrent
 version 
 system (cvs) perforce visual
 source
 safe PAIN Not that bad Please, just let me die Version Control
15. Distributed version control system Developed ~2005 by Linus Torvalds Free software (GNU(2) license)
16. Distributed version control system Developed ~2005 by Linus Torvalds Free software (GNU(2) license) Distributed
17. Distributed Everything* is local
18. Distributed fast Everything* is local
19. Distributed fast every clone is a backup Everything* is local
20. Distributed fast every clone is a backup work offline Everything* is local
21. Distributed fast every clone is a backup work offline push when you have network Everything* is local
22. Everything* is local
23. Everything* is local git vs svn
24. “Git’s idea of a “working copy” is very different from the working copy you get by checking out code from an SVN repository. Unlike SVN, Git makes no distinction between the working copy and the central repository—they are all full- fledged Git repositories.” Everything* is local
25. “Git’s idea of a “working copy” is very different from the working copy you get by checking out code from an SVN repository. Unlike SVN, Git makes no distinction between the working copy and the central repository—they are all full- fledged Git repositories.” https://www.atlassian.com/git/tutorials/setting-up-a-repository/git-clone Everything* is local
26. SVN MODEL
27. SVN MODEL
28. SVN MODEL “the only thing SVN client is able to do is compare your files with the latest revision and send this diff to the server” (http://hades.name/blog/2010/01/17/git-your-friend-not-foe/)
30. GIT MODEL
31. GIT MODEL
32. GIT MODEL Minus the misogyny
33. GIT MODEL Minus the misogyny Ralph’s
34. GIT MODEL Minus the misogyny Ralph’s Alixe’s
35. GIT MODEL Minus the misogyny Ralph’s Alixe’s JENKINS LOL
36. GIT MODEL
37. GIT MODEL ‘the concept of “central repository” may be eliminated altogether’
38. GIT MODEL ‘the concept of “central repository” may be eliminated altogether’ (http://hades.name/blog/2010/01/17/git-your-friend-not-foe/)
39. GIT MODEL
40. GIT MODEL status
41. GIT MODEL status log
42. GIT MODEL status log merge
43. GIT MODEL status log merge tag
44. GIT MODEL status log merge tag patch
45. GIT MODEL status log merge tag patch add
46. GIT MODEL status log merge tag patch add blame
47. GIT MODEL status log merge tag patch add blame commit
48. GIT MODEL status log merge tag patch add blame commit branch
49. GIT MODEL status log merge tag patch add blame commit branch reset
50. GIT MODEL status log merge tag patch add blame commit branch reset rebase
51. GIT MODEL status log merge tag patch add blame commit branch reset rebase push
52. GIT MODEL status log merge tag patch add blame commit branch reset rebase push
53. SVN MODEL
54. SVN MODEL status
55. SVN MODEL status patch
56. SVN MODEL status patch push
57. SVN MODEL status patch push
58. Distributed (local)
59. Distributed (local) CREATE A REPOSITORY
60. Distributed (local) CREATE A REPOSITORY
61. Distributed (local) CREATE A REPOSITORY SITORY
62. Distributed (local) CREATE A REPOSITORY O/ W SITORY
63. git init
64. Distributed
65. Distributed
66. Distributed
67. Distributed
70. DONE.
71. DONE. You just created your first git repository
72. Distributed (remote)
73. Distributed (remote) GET SOMEONE ELSE’S REPO
74. Distributed (remote) GET SOMEONE ELSE’S REPO
75. Distributed (remote) GET SOMEONE ELSE’S REPO
76. git clone
77. Distributed
78. Distributed
79. Distributed
80. Distributed
81. Distributed
82. Distributed
83. Distributed
84. Distributed Everything m8
87. DONE.
88. DONE. You just cloned a project with its entire history backed up inside ⚡ ⚡ ⚡ ⚡ ⚡ ⚡ ⚡ ⚡ ⚡ ⚡ ⚡ ⚡
89. Distributed (local)
90. Distributed (local) FIGURE OUT WHAT IS GOING ON
91. Distributed (local) FIGURE OUT WHAT IS GOING ON
92. git log
93. Distributed
94. Distributed
95. Distributed
96. Distributed git log --stat
97. Distributed git log --stat Shows files that have changed
98. Distributed
99. Distributed
100. Distributed commit message summary
101. Distributed Files that were changed commit message summary
102. Distributed Files that were changed commit message summary Author and Date
103. Distributed Files that were changed commit message summary Author and Date (hai!)
104. Distributed Files that were changed commit message summary Author and Date (hai!) How the files changed
105. Distributed
106. Distributed git log --follow
107. Distributed git log --follow Follow the history of commits for a single file
108. Distributed
109. Distributed
110. Distributed Only show bashmoji.sh commits
111. HOW?
112. HOW? A Simple Workflow
113. HOW? configure add/edit files commit/review push changes
114. configure add/edit files commit/review push changes configure
115. Configure
116. Configure
118. git config --global --list
119. git config --global --list List out all of your global git configurations
120. configure add/edit files commit/review push changes add/edit files
121. Add/edit
122. Add/edit
123. Add/edit
124. Add/edit
125. Add/edit Not yet tracked by git
127. git add
128. git add Add files to staging area/index
129. Add/edit
130. Add/edit
131. Add/edit Added but not yet committed
132. Add/edit Added but not yet committed The summary text is your friend
133. configure add/edit files commit/review push changes commit/review
135. git commit
136. git commit commit changes to head of index (but not yet to remote repo)
137. commit/review
138. commit/review Show what’s going on (diff) below your commit message
139. commit/review
140. commit/review
141. commit/review You can use this hash to refer to this specific commit in the future (if you’re so inclined)
142. commit/review You can use this hash to refer to this specific commit in the future (if you’re so inclined)
143. commit/review You can use this hash to refer to this specific commit in the future (if you’re so inclined)
144. commit/review You can use this hash to refer to this specific commit in the future (if you’re so inclined) there’s that hash ref again
146. git diff
147. git diff Show changes between commits/objects/etc
148. commit/review You can use this hash to refer to this specific commit in the future (if you’re so inclined)
149. commit/review You can use this hash to refer to this specific commit in the future (if you’re so inclined) Show the difference between where we are and up 1 revision (^) in the staging area
150. commit/review
151. configure add/edit files commit/review push changes push changes
153. git status
154. git status List the files you've changed and those you still need to add or commit
155. (review, then) push changes You can use this hash to refer to this specific commit in the future (if you’re so inclined)
156. (review, then) push changes You can use this hash to refer to this specific commit in the future (if you’re so inclined) Local copy knows you’re ahead of its concept of the remote repo
157. (review, then) push changes You can use this hash to refer to this specific commit in the future (if you’re so inclined)
158. (review, then) push changes You can use this hash to refer to this specific commit in the future (if you’re so inclined) Nothing more to commit since last we checked (you haven’t done anything more locally)
160. git push
161. git push Send changes your remote repository
162. push changes You can use this hash to refer to this specific commit in the future (if you’re so inclined)
163. push changes You can use this hash to refer to this specific commit in the future (if you’re so inclined)
164. push changes You can use this hash to refer to this specific commit in the future (if you’re so inclined)
165. push changes You can use this hash to refer to this specific commit in the future (if you’re so inclined)
167. DONE.
168. DONE. A complete* workflow
169. DONE. A complete* workflow
170. WHO?
171. WHO?
172. WHO? 2007: Linux Development community
173. WHO? 2007: Linux Development community ~2009: Most popular source control mechanism for open source projects
174. WHO? 2007: Linux Development community ~2009: Most popular source control mechanism for open source projects Most popular for all projects 2014
175. WHO?
176. WHO? Usage % 0 15 30 45 60 2009 2010 2011 2012 2013 2014 GIT SVN
177. WHO? Usage % 0 15 30 45 60 2009 2010 2011 2012 2013 2014 GIT SVN Based on The Eclipse Community Survey, 2009 — 2014 Source: http://programmers.stackexchange.com/questions/136079/are-there-any-statistics-that-show- the-popularity-of-git-versus-svn
178. resources git-scm.com gitref.org atlassian.com/git/tutorials Ralph Cowling (@_ralph)