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
大規模Reactアプリのリアーキテクチャ~8万行のTanStack Query移行の軌跡~
kj455
3
770
データアナリストが行うDatabricksを活用したETLの自動化事例
shinoa
0
250
Micro Frontends for Java Microservices - Devnexus 2024
mraible
PRO
0
420
Netty Chicago Java User Group 2024-04-17
sullis
0
130
Elm 0.19.0 Changes
bkuhlmann
0
480
코틀린으로 멀티플랫폼 만들기
pangmoo
0
120
StreamlitとTerraformでデータカタログを作った話
gussan0223
0
300
ログラスを支える設計標準について / loglass-design-standards
urmot
10
2.1k
Ruby Pattern Matching
bkuhlmann
0
920
Git Rebase
bkuhlmann
11
1.6k
二郎系ラーメンのコールで学ぶ AST 解析
memory1994
PRO
7
1.7k
甘い香りに誘われてVanilla Extractを1年間運用してみた
miyahkun
1
110
Featured
See All Featured
How GitHub Uses GitHub to Build GitHub
holman
468
290k
A Philosophy of Restraint
colly
196
16k
A Tale of Four Properties
chriscoyier
150
22k
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
186
16k
Why Our Code Smells
bkeepers
PRO
331
56k
Art, The Web, and Tiny UX
lynnandtonic
288
19k
Designing for humans not robots
tammielis
247
25k
Java REST API Framework Comparison - PWX 2021
mraible
PRO
18
6.9k
Put a Button on it: Removing Barriers to Going Fast.
kastner
58
3k
Designing on Purpose - Digital PM Summit 2013
jponch
110
6.4k
Unsuck your backbone
ammeep
662
57k
Fantastic passwords and where to find them - at NoRuKo
philnash
36
2.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!