Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git for the Uninitiated
Search
Matthew McCullough
February 18, 2013
Programming
1
310
Git for the Uninitiated
A presentation delivered by Matthew McCullough at DevNexus 2013 in Atlanta, GA, USA.
Matthew McCullough
February 18, 2013
Tweet
Share
More Decks by Matthew McCullough
See All by Matthew McCullough
Patterns for Collaborative Software Development in a Social World at JavaOne 2015
matthewmccullough
1
360
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
140
Git and GitHub Platform Review
matthewmccullough
1
330
Your First Pull Request
matthewmccullough
0
260
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
730
Agile-ish life at GitHub
matthewmccullough
2
310
Git and GitHub Agile Workflows for HP
matthewmccullough
0
260
Writing Tools on the GitHub Platform
matthewmccullough
0
220
Git Feature Branches as an Art
matthewmccullough
0
140
Other Decks in Programming
See All in Programming
Criando a Woovi em uma semana
daniloab
0
120
Deep Dive into React Stream/Serialize
mugi_uno
4
860
slog登場に伴うloggerの取り回し手法の見直し / kamakura.go #6
arthur1
0
140
ソースコードを美しくたもつために ~コードレビューの認知限界を突破し、年間400リリースを達成する~
kotauchisunsun
1
770
Exploring the Implementation of “t.Run”, “t.Parallel”, and “t.Cleanup”
akarin
1
160
The grand strategy of Ruby Parser
yui_knk
5
310
Let's learn code review
riofujimon
2
640
[RubyKaigi 2024] Ruby Mixology 101: adding shots of PHP, Elixir, and more
palkan
0
120
ts-morphを使ってコードリプレイスとASTへのハードルを下げる!
nyawach
5
330
戦略的DDDは重いのか? / Is strategic DDD heavy?
pictiny
3
2.1k
TypeScriptとGraphQLで実現する 型安全なAPI実装 / TSKaigi 2024
hokaccha
5
2.8k
TypeScriptで使いやすいOpenAPIの書き方
yukimochi_dwango
1
890
Featured
See All Featured
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
155
14k
Ruby is Unlike a Banana
tanoku
96
10k
In The Pink: A Labor of Love
frogandcode
138
21k
The Pragmatic Product Professional
lauravandoore
26
5.9k
Art, The Web, and Tiny UX
lynnandtonic
290
19k
Stop Working from a Prison Cell
hatefulcrawdad
266
19k
For a Future-Friendly Web
brad_frost
172
9k
WebSockets: Embracing the real-time Web
robhawkes
59
7k
RailsConf 2023
tenderlove
9
580
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
323
20k
It's Worth the Effort
3n
180
27k
jQuery: Nuts, Bolts and Bling
dougneiner
60
7.2k
Transcript
A collaborative reboot for version control GIT FOR THE UNINITIATED
Matthew.... @matthewmccull ‣Open source contributor ‣O'Reilly Git Video Co-instructor ‣Co-Author
of O'Reilly's Git book ‣5-year Git trainer ‣Instructor at GitHub
http://oreil.ly/ogitvid
http://amzn.to/oreillygit
None
None
None
None
Version Control A refreshed approach to VCS
None
Open Source
bash scripts ☛ C code
is not a slightly better
None
None
None
http://git-scm.com
Starting Up Creating a repository
Get a GitHub account.
Get a GitHub account. http://github.com/signup/free
Create a new repo(sitory).
Add a file.
View the commit history (timeline).
Make changes to the file.
Repo Creation Local and remote initialization simplicity
# Green field project $ git init newproject $ cd
newproject # ...start coding
or if you already have source code
# Legacy project tree $ cd existingproject $ git init
# Add all the code $ git add . $ git commit -m”Initial import”
‣Blob ‣Tree ‣Commit ‣Tag
tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:
8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162
Collaborating Two authors
Make simultaneous changes to the file.
Collaborating Redux Untrusted collaborators
Untrusted changes to the file.
Changelist Three stage thinking
Working Staging Repo add commit edit
None
‣shopping cart ‣put things in ‣take things out ‣purchase at
register
v1 v2 v3 v4 File A File B File C
File A File B File B File C v5 File A File B File B File A File A File C File C File C
Workspaces The power of simple branch toggling
Local Remote Upstream
# Creating a branch git branch <BRANCHNAME>
RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit
8c2d1 commit 1bdcd commit 2daa1
What do cheap branches enable?
‣Experimentation ‣
‣Experimentation ‣Safe experimentation
Better reuse of units of work
Work Models Enabling different development styles
product v1.0 integration story1 story2 v1.5 integration story3
Local Remote Upstream Integ Product Integ Product Integ Product
Local Remote Upstream Idea Story Feature Feature Feature Integ Product
Integ Product Integ Product
Local Remote Upstream Idea Story Feature Feature Feature Integ Product
Integ Product Integ Product
Central Repo C e n t r a l i
z e d
Blessed Repo D i c t a t o r
s h i p
Certified Repo Development Repo n t e g r a
t i o n M a n a g e d Continuous Integration Server
C u s t o m + P u b
l i c C o n t r i b Customized ☚ Private Public ☛ GitHub
Mirror Development Repo M i r r o r e
d Mirror Certified Repo
Client Apps GUIs and other front-ends
http://windows.github.com
http://windows.github.com
http://mac.github.com
http://mac.github.com
Remotes Bandwidth and geographic challenges
Local Remote Upstream
Local Remote Upstream
Local Remote Upstream
data from http://whygitisbetterthanx.com/#git-is-fast git svn Init git svn Status git
svn Diff git svn Tag git svn Log git svn Commit (Lg) git svn Commit (Sm) git c svn c Branch Speed
Local Remote Upstream commit fetch push clone clone clone push
pull pull pull
Commit Push Pull
Commit Push Pull
Commit Push Pull
Integration CI, scripting, and hooks
None
"This is so important, we can't entrust it to automation.
We need our top developer to supervise it."
continuous integration servers jenkins travis ci circleci buildhive
None
None
None
None
None
Summary The Git and GitHub ecosystem
[email protected]
github.com/training @githubtraining githubtraining Q&A
http://learn.github.com
http://teach.github.com
Why Git?
None
None
I'm an egotistical bastard, and I name all my projects
after myself. First Linux, now git. -Linus Torvalds “ Credits: Martin Streicher, http://en.wikipedia.org/wiki/File:Linus_Torvalds.jpeg
CVS Subversion PVCS Perforce Clear Case Source Safe RCS Folders
Small Footprint
Simple
Powerful
Composable
Setting Up Git
binaries on your $PATH
http://help.github.com
None
Using Git
Create a Git repository
None
http://git-scm.com/book
http://teach.github.com
http://help.github.com
Git GUIs
None
https://github.com/github/GitPad
None
http://eclipse.org/egit/
None
Using GitHub
None
‣Social coding ‣Fork and pull model
Blessed Repo
None
‣Web-based image diff ‣Lightweight issue tracking
None
None
https://enterprise.github.com
None
Q&A
@matthewmccull
[email protected]
training.github.com