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
480
Code Review (Navy Hackathon)
rantav
0
49
Infrastructure Testing Using Kubernetes And Golang
rantav
0
61
Infrastructure testing using Kubernetes
rantav
0
490
Interview Workshop - Technical Questions
rantav
0
300
Code Review Best Practices
rantav
0
61
Code Review @ AppsFlyer
rantav
0
61
GraphQL at Yodas
rantav
2
170
Git for champs
rantav
0
140
Other Decks in Programming
See All in Programming
イベント駆動で成長して委員会
happymana
1
270
OpenTelemetryでRailsのパフォーマンス分析を始めてみよう(KoR2024)
ymtdzzz
5
2k
Quine, Polyglot, 良いコード
qnighy
4
620
Java ジェネリクス入門 2024
nagise
0
690
【Kaigi on Rails 2024】YOUTRUST スポンサーLT
krpk1900
1
310
讓數據說話:用 Python、Prometheus 和 Grafana 講故事
eddie
0
390
EventSourcingの理想と現実
wenas
6
2.2k
みんなでプロポーザルを書いてみた
yuriko1211
0
190
カラム追加で増えるActiveRecordのメモリサイズ イメージできますか?
asayamakk
4
1.9k
A Journey of Contribution and Collaboration in Open Source
ivargrimstad
0
440
Pinia Colada が実現するスマートな非同期処理
naokihaba
4
200
Boost Performance and Developer Productivity with Jakarta EE 11
ivargrimstad
0
1.5k
Featured
See All Featured
The Language of Interfaces
destraynor
154
24k
Agile that works and the tools we love
rasmusluckow
327
21k
Build The Right Thing And Hit Your Dates
maggiecrowley
33
2.4k
BBQ
matthewcrist
85
9.3k
KATA
mclloyd
29
14k
Intergalactic Javascript Robots from Outer Space
tanoku
268
27k
The Power of CSS Pseudo Elements
geoffreycrofte
73
5.3k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
131
33k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
38
1.8k
Optimising Largest Contentful Paint
csswizardry
33
2.9k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
26
1.4k
We Have a Design System, Now What?
morganepeng
50
7.2k
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