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
git hygiene
Search
elise_huard
May 02, 2012
Programming
3
390
git hygiene
a small description of how to keep your git tree tidy
elise_huard
May 02, 2012
Tweet
Share
More Decks by elise_huard
See All by elise_huard
FRP in games
elise_huard
0
170
Game in Haskell at Strangeloop 2014
elise_huard
4
500
Functional Programming is the new black
elise_huard
4
1.2k
Tracing your way through Ruby
elise_huard
4
530
Ruby's bin men
elise_huard
1
150
Ruby's bin men
elise_huard
2
940
data driven development
elise_huard
5
250
Data Driven Development
elise_huard
3
430
Ruby goes to Hollywood
elise_huard
1
520
Other Decks in Programming
See All in Programming
React + TextAliveでカッコいいLyric Applicatioinを作ろう!!
tosuri13
0
400
A New Era of Testing
mannodermaus
2
520
Amazon BedrockでサーバレスなAIお料理ボットを作成する!!
tosuri13
0
230
What you can do with Ruby on WebAssembly
kateinoigakukun
0
170
API Platform for Laravel
dunglas
1
520
いつか使える ObjectSpace / Maybe useful ObjectSpace
euglena1215
2
140
How to Break into Reading Open Source
kaspth
2
220
エンジニア1年目で複雑なコードの改善に取り組んだ話
mtnmr
3
2k
REXML改善のその後
naitoh
0
190
Increased Performance and Developer Productivity with Jakarta EE 11
ivargrimstad
0
400
Lessons by WebAssembly app in production on CDN Edge Computing Service
tetsuharuohzeki
0
210
Amazon Neptuneで始める初めてのグラフDB ー グラフDBを使う意味を考える ー
satoshi256kbyte
2
260
Featured
See All Featured
Building Flexible Design Systems
yeseniaperezcruz
325
38k
jQuery: Nuts, Bolts and Bling
dougneiner
61
7.4k
Being A Developer After 40
akosma
84
590k
Side Projects
sachag
451
42k
How GitHub Uses GitHub to Build GitHub
holman
472
290k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
36
2.1k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
chriscoyier
502
140k
Bash Introduction
62gerente
608
210k
What's in a price? How to price your products and services
michaelherold
242
11k
Agile that works and the tools we love
rasmusluckow
327
20k
5 minutes of I Can Smell Your CMS
philhawksworth
202
19k
Optimising Largest Contentful Paint
csswizardry
31
2.8k
Transcript
Git hygiene Forward First Tuesdays 01/05/2012 Wednesday, 2 May 12
The problem Wednesday, 2 May 12
Wednesday, 2 May 12
merge foobars + messy tree Wednesday, 2 May 12
Solution Wednesday, 2 May 12
avoid large merges: git pull --rebase ATFT Wednesday, 2 May
12
git commit often Wednesday, 2 May 12
http://whatthecommit.com/ Wednesday, 2 May 12
git push often (after git pull --rebase!) Wednesday, 2 May
12
disruptive features Wednesday, 2 May 12
1. feature branches Wednesday, 2 May 12
squash commits (git rebase -i) git merge -no-ff Wednesday, 2
May 12
Wednesday, 2 May 12
2. keep it in master switch the feature on or
off in the code Wednesday, 2 May 12
Conclusion: - avoid errors - an expressive git tree Wednesday,
2 May 12
... Doesn’t take a lot of effort! Wednesday, 2 May
12