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
180
Game in Haskell at Strangeloop 2014
elise_huard
4
510
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
960
data driven development
elise_huard
5
250
Data Driven Development
elise_huard
3
430
Ruby goes to Hollywood
elise_huard
1
530
Other Decks in Programming
See All in Programming
楽しく向き合う例外対応
okutsu
0
730
Go 1.24でジェネリックになった型エイリアスの紹介
syumai
2
300
たのしいSocketのしくみ / Socket Under a Microscope
coe401_
8
1.4k
Ça bouge du côté des animations CSS !
goetter
2
160
Jasprが凄い話
hyshu
0
180
CSS Linter による Baseline サポートの仕組み
ryo_manba
1
160
15分で学ぶDuckDBの可愛い使い方 DuckDBの最近の更新
notrogue
3
820
[JAWS DAYS 2025] 最近の DB の競合解決の仕組みが分かった気になってみた
maroon1st
0
160
LINE messaging APIを使ってGoogleカレンダーと連携した予約ツールを作ってみた
takumakoike
0
130
データベースのオペレーターであるCloudNativePGがStatefulSetを使わない理由に迫る
nnaka2992
0
250
未経験でSRE、はじめました! 組織を支える役割と軌跡
curekoshimizu
1
200
仕様変更に耐えるための"今の"DRY原則を考える
mkmk884
9
3.2k
Featured
See All Featured
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
40
2k
Facilitating Awesome Meetings
lara
53
6.3k
Rails Girls Zürich Keynote
gr2m
94
13k
Mobile First: as difficult as doing things right
swwweet
223
9.5k
Building Better People: How to give real-time feedback that sticks.
wjessup
367
19k
No one is an island. Learnings from fostering a developers community.
thoeni
21
3.2k
Into the Great Unknown - MozCon
thekraken
35
1.6k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
47
5.2k
Code Review Best Practice
trishagee
67
18k
Become a Pro
speakerdeck
PRO
26
5.2k
BBQ
matthewcrist
87
9.5k
A Modern Web Designer's Workflow
chriscoyier
693
190k
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