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.2k
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
明示と暗黙 ー PHPとGoの インターフェイスの違いを知る
shimabox
2
510
AI時代の『改訂新版 良いコード/悪いコードで学ぶ設計入門』 / ai-good-code-bad-code
minodriven
14
4.3k
PHPで始める振る舞い駆動開発(Behaviour-Driven Development)
ohmori_yusuke
2
390
Hack Claude Code with Claude Code
choplin
4
2.1k
iOS 26にアップデートすると実機でのHot Reloadができない?
umigishiaoi
0
130
Team operations that are not burdened by SRE
kazatohiei
1
310
技術同人誌をMCP Serverにしてみた
74th
1
640
Hypervel - A Coroutine Framework for Laravel Artisans
albertcht
1
130
テストから始めるAgentic Coding 〜Claude Codeと共に行うTDD〜 / Agentic Coding starts with testing
rkaga
12
4.5k
AIと”コードの評価関数”を共有する / Share the "code evaluation function" with AI
euglena1215
1
160
High-Level Programming Languages in AI Era -Human Thought and Mind-
hayat01sh1da
PRO
0
770
第9回 情シス転職ミートアップ 株式会社IVRy(アイブリー)の紹介
ivry_presentationmaterials
1
320
Featured
See All Featured
For a Future-Friendly Web
brad_frost
179
9.8k
Designing Dashboards & Data Visualisations in Web Apps
destraynor
231
53k
Adopting Sorbet at Scale
ufuk
77
9.5k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
PRO
181
54k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
addyosmani
7
740
Being A Developer After 40
akosma
90
590k
Fireside Chat
paigeccino
37
3.5k
How STYLIGHT went responsive
nonsquared
100
5.6k
StorybookのUI Testing Handbookを読んだ
zakiyama
30
5.9k
Practical Tips for Bootstrapping Information Extraction Pipelines
honnibal
PRO
20
1.3k
The Power of CSS Pseudo Elements
geoffreycrofte
77
5.9k
A Tale of Four Properties
chriscoyier
160
23k
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