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
600
The Secret
mmozuras
0
290
Am I Still Productive?
mmozuras
0
450
The Three Last Conversations
mmozuras
0
390
Vinted Adventure
mmozuras
0
420
Frequent Releases & Major Changes
mmozuras
1
1k
Engineering for Engineering's Sake
mmozuras
1
1.5k
Life Embetterment With Hundreds of Deployments a Day
mmozuras
1
520
How to Build an Open Source Project in 3 Years
mmozuras
2
580
Other Decks in Programming
See All in Programming
TypeScript製IaCツールのAWS CDKが様々な言語で実装できる理由 ~他言語変換の仕組み~ / cdk-language-transformation
gotok365
7
380
衛星の軌道をWeb地図上に表示する
sankichi92
0
250
Blueskyのプラグインを作ってみた
hakkadaikon
1
290
AIエージェントによるテストフレームワーク Arbigent
takahirom
0
280
REST API設計の実践 – ベストプラクティスとその落とし穴
kentaroutakeda
2
320
tsconfigのオプションで変わる型世界
keisukeikeda
1
130
TypeScript だけを書いて Tauri でデスクトップアプリを作ろう / Tauri with only TypeScript
tris5572
2
540
JVM の仕組みを理解して PHP で実装してみよう
m3m0r7
PRO
1
250
Babylon.js 8.0のアプデ情報を 軽率にキャッチアップ / catch-up-babylonjs-8
drumath2237
0
110
Agent Rules as Domain Parser
yodakeisuke
1
350
Javaに鉄道指向プログラミング (Railway Oriented Pro gramming) のエッセンスを取り入れる/Bringing the Essence of Railway-Oriented Programming to Java
cocet33000
1
110
DevTalks 25 - Create your own AI-infused Java apps with ease
kdubois
2
120
Featured
See All Featured
Automating Front-end Workflow
addyosmani
1370
200k
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
123
52k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
26k
Fireside Chat
paigeccino
37
3.5k
Designing Experiences People Love
moore
142
24k
Navigating Team Friction
lara
186
15k
For a Future-Friendly Web
brad_frost
178
9.7k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
30
2.1k
Thoughts on Productivity
jonyablonski
69
4.7k
Typedesign – Prime Four
hannesfritz
41
2.6k
Product Roadmaps are Hard
iamctodd
PRO
53
11k
Fontdeck: Realign not Redesign
paulrobertlloyd
84
5.5k
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!