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
400
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
190
Game in Haskell at Strangeloop 2014
elise_huard
4
510
Functional Programming is the new black
elise_huard
4
1.3k
Tracing your way through Ruby
elise_huard
4
530
Ruby's bin men
elise_huard
1
160
Ruby's bin men
elise_huard
2
980
data driven development
elise_huard
5
260
Data Driven Development
elise_huard
3
440
Ruby goes to Hollywood
elise_huard
1
540
Other Decks in Programming
See All in Programming
TFLintカスタムプラグインで始める Terraformコード品質管理
bells17
2
460
三者三様 宣言的UI
kkagurazaka
0
250
Foundation Modelsを実装日本語学習アプリを作ってみた!
hypebeans
0
130
Android16 Migration Stories ~Building a Pattern for Android OS upgrades~
reoandroider
0
140
AI駆動で0→1をやって見えた光と伸びしろ
passion0102
1
860
Google Opalで使える37のライブラリ
mickey_kubo
3
150
ALL CODE BASE ARE BELONG TO STUDY
uzulla
28
6.7k
Leading Effective Engineering Teams in the AI Era
addyosmani
7
640
Pythonに漸進的に型をつける
nealle
1
130
CSC509 Lecture 06
javiergs
PRO
0
270
PHPに関数型の魂を宿す〜PHP 8.5 で実現する堅牢なコードとは〜 #phpcon_hiroshima / phpcon-hiroshima-2025
shogogg
1
340
「ちょっと古いから」って避けてた技術書、今だからこそ読もう
mottyzzz
12
7.2k
Featured
See All Featured
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
194
16k
Typedesign – Prime Four
hannesfritz
42
2.8k
A Modern Web Designer's Workflow
chriscoyier
697
190k
Imperfection Machines: The Place of Print at Facebook
scottboms
269
13k
[RailsConf 2023] Rails as a piece of cake
palkan
57
5.9k
Building a Scalable Design System with Sketch
lauravandoore
463
33k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
285
14k
Unsuck your backbone
ammeep
671
58k
Embracing the Ebb and Flow
colly
88
4.9k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
kevinliebholz
36
6.1k
StorybookのUI Testing Handbookを読んだ
zakiyama
31
6.2k
Visualization
eitanlees
149
16k
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