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
ふつうの技術スタックでアート作品を作ってみる
akira888
1
840
AIと”コードの評価関数”を共有する / Share the "code evaluation function" with AI
euglena1215
1
160
VS Code Update for GitHub Copilot
74th
2
640
20250704_教育事業におけるアジャイルなデータ基盤構築
hanon52_
5
790
PHPで始める振る舞い駆動開発(Behaviour-Driven Development)
ohmori_yusuke
2
390
PostgreSQLのRow Level SecurityをPHPのORMで扱う Eloquent vs Doctrine #phpcon #track2
77web
2
530
Hack Claude Code with Claude Code
choplin
4
2k
ニーリーにおけるプロダクトエンジニア
nealle
0
830
AI時代のソフトウェア開発を考える(2025/07版) / Agentic Software Engineering Findy 2025-07 Edition
twada
PRO
86
29k
AI コーディングエージェントの時代へ:JetBrains が描く開発の未来
masaruhr
1
150
Porting a visionOS App to Android XR
akkeylab
0
460
“いい感じ“な定量評価を求めて - Four Keysとアウトカムの間の探求 -
nealle
1
10k
Featured
See All Featured
Build The Right Thing And Hit Your Dates
maggiecrowley
36
2.8k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
smashingmag
251
21k
A better future with KSS
kneath
238
17k
Raft: Consensus for Rubyists
vanstee
140
7k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
31
2.4k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
addyosmani
7
740
GraphQLとの向き合い方2022年版
quramy
49
14k
StorybookのUI Testing Handbookを読んだ
zakiyama
30
5.9k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
PRO
181
54k
The Art of Programming - Codeland 2020
erikaheidi
54
13k
Building a Modern Day E-commerce SEO Strategy
aleyda
42
7.4k
Facilitating Awesome Meetings
lara
54
6.4k
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