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
180
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
600
Code Review (Navy Hackathon)
rantav
0
81
Infrastructure Testing Using Kubernetes And Golang
rantav
0
87
Infrastructure testing using Kubernetes
rantav
0
540
Interview Workshop - Technical Questions
rantav
0
330
Code Review Best Practices
rantav
0
89
Code Review @ AppsFlyer
rantav
0
89
GraphQL at Yodas
rantav
2
170
Git for champs
rantav
0
150
Other Decks in Programming
See All in Programming
『毎日の移動』を支えるGoバックエンド内製開発
yutautsugi
2
190
monorepo の Go テストをはやくした〜い!~最小の依存解決への道のり~ / faster-testing-of-monorepos
convto
2
390
Go言語の特性を活かした公式MCP SDKの設計
hond0413
1
180
AI Coding Meetup #3 - 導入セッション / ai-coding-meetup-3
izumin5210
0
590
私達はmodernize packageに夢を見るか feat. go/analysis, go/ast / Go Conference 2025
kaorumuta
2
490
GitHub Actions × AWS OIDC連携の仕組みと経緯を理解する
ota1022
0
240
Pythonスレッドとは結局何なのか? CPython実装から見るNoGIL時代の変化
curekoshimizu
4
1.3k
uniqueパッケージの内部実装を支えるweak pointerの話
magavel
0
920
止められない医療アプリ、そっと Swift 6 へ
medley
1
120
After go func(): Goroutines Through a Beginner’s Eye
97vaibhav
0
230
LLMとPlaywright/reg-suitを活用した jQueryリファクタリングの実際
kinocoboy2
4
670
Catch Up: Go Style Guide Update
andpad
0
170
Featured
See All Featured
Fireside Chat
paigeccino
40
3.7k
StorybookのUI Testing Handbookを読んだ
zakiyama
31
6.2k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
33
2.5k
Building an army of robots
kneath
306
46k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
PRO
188
55k
YesSQL, Process and Tooling at Scale
rocio
173
14k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
54
3k
Six Lessons from altMBA
skipperchong
28
4k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
49
3.1k
Raft: Consensus for Rubyists
vanstee
139
7.1k
The Invisible Side of Design
smashingmag
301
51k
BBQ
matthewcrist
89
9.8k
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