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
82
Infrastructure Testing Using Kubernetes And Golang
rantav
0
89
Infrastructure testing using Kubernetes
rantav
0
550
Interview Workshop - Technical Questions
rantav
0
330
Code Review Best Practices
rantav
0
91
Code Review @ AppsFlyer
rantav
0
90
GraphQL at Yodas
rantav
2
170
Git for champs
rantav
0
150
Other Decks in Programming
See All in Programming
スマホから Youtube Shortsを見られないようにする
lemolatoon
27
34k
はじめてのDSPy - 言語モデルを『プロンプト』ではなく『プログラミング』するための仕組み
masahiro_nishimi
4
16k
マンガアプリViewerの大画面対応を考える
kk__777
0
260
Goで実践するドメイン駆動開発 AIと歩み始めた新規プロダクト開発の現在地
imkaoru
4
900
Claude CodeによるAI駆動開発の実践 〜そこから見えてきたこれからのプログラミング〜
iriikeita
0
340
Android16 Migration Stories ~Building a Pattern for Android OS upgrades~
reoandroider
0
140
O Que É e Como Funciona o PHP-FPM?
marcelgsantos
0
200
「ちょっと古いから」って避けてた技術書、今だからこそ読もう
mottyzzz
12
7.2k
3年ぶりにコードを書いた元CTOが Claude Codeと30分でMVPを作った話
maikokojima
0
650
kiroとCodexで最高のSpec駆動開発を!!数時間で web3ネイティブなミニゲームを作ってみたよ!
mashharuki
0
920
組込みだけじゃない!TinyGo で始める無料クラウド開発入門
otakakot
2
380
登壇は dynamic! な営みである / speech is dynamic
da1chi
0
360
Featured
See All Featured
Statistics for Hackers
jakevdp
799
220k
個人開発の失敗を避けるイケてる考え方 / tips for indie hackers
panda_program
116
20k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
162
15k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
31
2.7k
Side Projects
sachag
455
43k
Building Flexible Design Systems
yeseniaperezcruz
329
39k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
PRO
190
55k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
49
3.1k
GraphQLの誤解/rethinking-graphql
sonatard
73
11k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
46
2.5k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
52
5.7k
Being A Developer After 40
akosma
91
590k
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