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
520
Code Review (Navy Hackathon)
rantav
0
51
Infrastructure Testing Using Kubernetes And Golang
rantav
0
63
Infrastructure testing using Kubernetes
rantav
0
500
Interview Workshop - Technical Questions
rantav
0
310
Code Review Best Practices
rantav
0
65
Code Review @ AppsFlyer
rantav
0
62
GraphQL at Yodas
rantav
2
170
Git for champs
rantav
0
140
Other Decks in Programming
See All in Programming
PEPCは何を変えようとしていたのか
ken7253
3
310
Generating OpenAPI schema from serializers throughout the Rails stack - Kyobashi.rb #5
envek
1
430
DRFを少しずつ オニオンアーキテクチャに寄せていく DjangoCongress JP 2025
nealle
2
290
Ça bouge du côté des animations CSS !
goetter
2
160
PHPカンファレンス名古屋2025 タスク分解の試行錯誤〜レビュー負荷を下げるために〜
soichi
1
740
From the Wild into the Clouds - Laravel Meetup Talk
neverything
0
180
.NET Frameworkでも汎用ホストが使いたい!
tomokusaba
0
210
たのしいSocketのしくみ / Socket Under a Microscope
coe401_
8
1.4k
データベースのオペレーターであるCloudNativePGがStatefulSetを使わない理由に迫る
nnaka2992
0
250
Rubyと自由とAIと
yotii23
6
1.9k
Honoをフロントエンドで使う 3つのやり方
yusukebe
7
3.6k
クリーンアーキテクチャから見る依存の向きの大切さ
shimabox
5
1.1k
Featured
See All Featured
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
134
33k
Unsuck your backbone
ammeep
669
57k
No one is an island. Learnings from fostering a developers community.
thoeni
21
3.2k
It's Worth the Effort
3n
184
28k
Improving Core Web Vitals using Speculation Rules API
sergeychernyshev
11
540
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
40
2k
Practical Orchestrator
shlominoach
186
10k
Embracing the Ebb and Flow
colly
84
4.6k
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
115
51k
Six Lessons from altMBA
skipperchong
27
3.6k
Speed Design
sergeychernyshev
28
820
Music & Morning Musume
bryan
46
6.4k
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 “rantav@gmail.com” 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