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
Leaning Git
Search
Ran Tavory
May 25, 2014
Programming
1
170
Leaning Git
Introduction to the team at Totango - a team of SVN users to git.
Ran Tavory
May 25, 2014
Tweet
Share
More Decks by Ran Tavory
See All by Ran Tavory
go-grpc-channelz: a Go based UI for gRPC's channelz
rantav
0
460
Code Review (Navy Hackathon)
rantav
0
49
Infrastructure Testing Using Kubernetes And Golang
rantav
0
57
Infrastructure testing using Kubernetes
rantav
0
470
Interview Workshop - Technical Questions
rantav
0
300
Code Review Best Practices
rantav
0
61
Code Review @ AppsFlyer
rantav
0
60
GraphQL at Yodas
rantav
2
170
Git for champs
rantav
0
140
Other Decks in Programming
See All in Programming
2024 컴포즈 정원사
jisungbin
0
150
Why Prism?
kddnewton
4
1.7k
事業フェーズの変化に対応する 開発生産性向上のゼロイチ
masaygggg
0
210
Ruby Parser progress report 2024
yui_knk
2
230
Composing an API the *right* way (Droidcon New York 2024)
zsmb
2
160
LangGraphでのHuman-in-the-Loopの実装
os1ma
3
1.1k
LangChainの現在とv0.3にむけて
os1ma
4
940
The Sequel to a Dream of Ruby Parser's Grammar
ydah
1
220
Crafting Cross-Platform Adventures: Building a Game Engine with Kotlin Multiplatform
dwursteisen
0
210
KSPの導入・移行を前向きに検討しよう!
shxun6934
PRO
0
290
[DroidKaigi 2024] Android ViewからJetpack Composeへ 〜Jetpack Compose移行のすゝめ〜 / From Android View to Jetpack Compose: A Guide to Migration
syarihu
1
690
Prompt Cachingは本当に効果的なのか検証してみた.pdf
ttnyt8701
0
540
Featured
See All Featured
BBQ
matthewcrist
83
9.2k
Build your cross-platform service in a week with App Engine
jlugia
228
18k
RailsConf 2023
tenderlove
28
810
[RailsConf 2023] Rails as a piece of cake
palkan
48
4.6k
Faster Mobile Websites
deanohume
304
30k
Debugging Ruby Performance
tmm1
72
12k
Imperfection Machines: The Place of Print at Facebook
scottboms
263
13k
The Pragmatic Product Professional
lauravandoore
31
6.2k
Web development in the modern age
philhawksworth
205
10k
How STYLIGHT went responsive
nonsquared
93
5.1k
Git: the NoSQL Database
bkeepers
PRO
425
64k
Raft: Consensus for Rubyists
vanstee
136
6.5k
Transcript
Git Introduction For Subversion Users Ran Tavory Totango Sunday, May
25, 14
Why Git? • Because IT IS BETTER Sunday, May 25,
14
Git is a File System Sunday, May 25, 14
All (most) Operations are Local and Fast! • Commit •
Log (view history) • Diff • ... Sunday, May 25, 14
Git is Distributed Sunday, May 25, 14
Git is Fast Sunday, May 25, 14
Lightweight (and local) Branching Sunday, May 25, 14
Data Integrity Sunday, May 25, 14
Staging Area Sunday, May 25, 14
Stash Area Sunday, May 25, 14
Sunday, May 25, 14
Git Setup $ brew install git $ git config --global
user.name “Ran Tavory” $ git config --global user.email “
[email protected]
” https://gist.github.com/rantav/ 5d6fb14057f062ecbc70 Sunday, May 25, 14
GitHub Setup https://help.github.com/articles/ set-up-git Sunday, May 25, 14
Clone the Repo $git clone https://github.com/ totango/main.git Sunday, May 25,
14
git status Sunday, May 25, 14
git add Sunday, May 25, 14
git diff Sunday, May 25, 14
git commit Sunday, May 25, 14
git commit --amend Sunday, May 25, 14
git checkout Sunday, May 25, 14
git rm Sunday, May 25, 14
git mv Sunday, May 25, 14
git log Sunday, May 25, 14
git log -p Sunday, May 25, 14
git log --word-diff Sunday, May 25, 14
git log --stat Sunday, May 25, 14
git log hacking Sunday, May 25, 14
git remote Sunday, May 25, 14
git pull Sunday, May 25, 14
rebase or no? • Prefer rebase • this keeps the
commit log cleaner •git pl • Sometimes an actual merge is needed • So don’t rebase • For example, when merging branches Sunday, May 25, 14
git push Sunday, May 25, 14
Git for SVN Sunday, May 25, 14
Git for SVN Sunday, May 25, 14
Git for SVN Sunday, May 25, 14
Git Lifecycle Sunday, May 25, 14
The Staging Area (AKA The Index) Sunday, May 25, 14
.gitignore Sunday, May 25, 14
Learning More Sunday, May 25, 14
Bonus: zsh integration Sunday, May 25, 14
Not Today: Branching Sunday, May 25, 14
Totango Links • Wiki: https://sites.google.com/a/ totango.com/wiki/engineering/git • Repo: https://github.com/totango/main •
CI: TODO Sunday, May 25, 14
References http://git-scm.com/about http://thkoch2001.github.io/whygitisbetter/ http://www.slideshare.net/manishchaks/subversion- to-git-migration http://www.git-tower.com/blog/git-for-subversion- users-cheat-sheet-detail/ http://git.or.cz/course/svn.html AKA where
did I steal from? Sunday, May 25, 14