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
Search
Mindaugas Mozūras
March 21, 2012
Programming
17
4.9k
git
Introduction to Git. A presentation I gave at local user-groups.
Mindaugas Mozūras
March 21, 2012
Tweet
Share
More Decks by Mindaugas Mozūras
See All by Mindaugas Mozūras
Sustainable Speed
mmozuras
0
510
The Secret
mmozuras
0
250
Am I Still Productive?
mmozuras
0
420
The Three Last Conversations
mmozuras
0
360
Vinted Adventure
mmozuras
0
370
Frequent Releases & Major Changes
mmozuras
1
790
Engineering for Engineering's Sake
mmozuras
1
1.2k
Life Embetterment With Hundreds of Deployments a Day
mmozuras
1
480
How to Build an Open Source Project in 3 Years
mmozuras
2
540
Other Decks in Programming
See All in Programming
Elm 0.19.0 Changes
bkuhlmann
0
490
GraphQLサーバの構成要素を整理する #ハッカー鮨 #tsukijigraphql / graphql server technology selection
izumin5210
4
870
CA.swift19 恋するAIアプリ開発の裏側
oskmr
0
370
try! Swift Tokyo 2024 参加報告 / try! Swift Tokyo 2024 Report
hironytic
0
210
Fast JSX: Don't clone props object #28768
yossydev
1
140
PHPの次期バージョンはこの時期どうなっているのか - Internalsの開発体制について - PHPカンファレンス小田原
youkidearitai
PRO
1
190
Site Reliability Engineering for GMO
pyama86
8
1.1k
Ruby Function Composition
bkuhlmann
1
330
Blue/Greenデプロイの導入による 運用フローの改善
kudoas
1
390
新宿ダンジョンを可視化してみた
satoshi7190
2
270
Elm Form Validation
bkuhlmann
0
510
Hanami and htmx
bkuhlmann
0
210
Featured
See All Featured
Gamification - CAS2011
davidbonilla
76
4.6k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
19
1.7k
The Invisible Customer
myddelton
114
12k
Mobile First: as difficult as doing things right
swwweet
216
8.6k
Why You Should Never Use an ORM
jnunemaker
PRO
51
8.6k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
116
18k
The Invisible Side of Design
smashingmag
294
49k
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
187
16k
The Language of Interfaces
destraynor
151
23k
Being A Developer After 40
akosma
62
580k
Visualization
eitanlees
136
14k
Debugging Ruby Performance
tmm1
70
11k
Transcript
git or: how I learned to stop worrying and love
source control
why you should care
Traditional version control systems have deficiencies
Subversion, Perforce, CVS, TFS...
OH, THE PAIN! SLOW TREE CONFLICTS MERGING IS CHALLENGING BRANCHES
ARE JUST COPIES
using svn
using git
is awesome git
It’s distributed! Distributed Version Control System
Every repository is equal.
You can work offline.
Fast as lightning.
add status diff log commit branch git mercurial bazaar
Very efficient. git clone rails - 53 seconds 40mb, 2356
files, 29045 commits
Great branching and merging.
Any workflow you want, you got it...
Shared repository
Blessed repository Linus Torvalds Lieutenants Developers
everyone uses git
14% 29% 55% GitHub SourceForge Google Code CodePlex Total number
of commits 2011.01 - 2011.05
automapper backbone bootstrap cassandra coffeescript couchdb cucumber fluent-nhibernate git jekyll
less linux modernizr mongodb mono nancy ninject node nservicebus rails ravendb reddit
how toinstall
Linux: apt-get install git-core Mac OS X: brew install git
Windows: chocolatey install msysgit
getting started
git config --global user.name ... git config --global user.email ...
git init
master has no special meaning. It’s just a default branch.
git add --all
git commit
189f30b664981e4397625791c8ea3bbb5f2279a3 Commit “name” is a 40-digit SHA
There are four types of objects: tag, commit, tree and
blob.
git remote add origin git@git...
git push origin master
HEAD is a reference to the last commit in the
current branch.
git pull origin master
Basic training complete.
and history branching
git branch name
Branch is a reference to the head of a line
of work.
git checkout name
git merge name
git reset --hard commit
git rebase name
merge is fine, but in a lot of cases, rebase
is better.
git commit --amend
git rebase --interactive
Interactive rebase lets you: reword, edit, squash, fixup, exec, remove
and reorder.
You can change history of remote repository with git push
--force. Be careful!
Rewriting history is fun and useful!
svn git-
git svn clone http://...
git svn rebase ~ svn update
git svn dcommit ~ svn commit
GitHub
The best way to collaborate.
~1.5 million people, ~2.5 million repositories.
Phil Haack, Adam Roben, Paul Betts are GitHubbers
github.com/Haacked/SeeGit GitHub for Windows...?
thoughts closing
blame bisect cherry-pick clean cvsimport describe diff fetch filter-branch grep
request-pull revert svnimport stash submodule tag and more...
progit.org gitready.com gitimmersion.com ontwik.com/category/git-github RESOURCES
https://git.wiki.kernel.org/articles/i/n/t/ Interfaces,_frontends,_and_tools.html TortoiseGit Git Extensions Git Source Control Provider TOOLS
Git != Subversion + Magic
The slogan of Subversion for a while was "CVS done
right". If you start with that kind of slogan, there's nowhere you can go. There is no way to do CVS right. Linus Torvalds
Zach Holman @holman thenounproject.com thanks to:
twitter.com/mmozuras github.com/mmozuras thanks!