Lock in $30 Savings on PRO—Offer Ends Soon! ⏳

git hygiene

Avatar for elise_huard elise_huard
May 02, 2012
Programming
3
400

git hygiene

a small description of how to keep your git tree tidy

Avatar for elise_huard

elise_huard

May 02, 2012
Tweet

More Decks by elise_huard

See All by elise_huard
FRP in games
Avatar for elise_huard elise_huard
0
200
Game in Haskell at Strangeloop 2014
Avatar for elise_huard elise_huard
4
520
Functional Programming is the new black
Avatar for elise_huard elise_huard
4
1.3k
Tracing your way through Ruby
Avatar for elise_huard elise_huard
4
530
Ruby's bin men
Avatar for elise_huard elise_huard
1
160
Ruby's bin men
Avatar for elise_huard elise_huard
2
980
data driven development
Avatar for elise_huard elise_huard
5
260
Data Driven Development
Avatar for elise_huard elise_huard
3
440
Ruby goes to Hollywood
Avatar for elise_huard elise_huard
1
540

Other Decks in Programming

See All in Programming
Microservices Platforms: When Team Topologies Meets Microservices Patterns
Avatar for Chris Richardson cer
PRO
1
1k
非同期処理の迷宮を抜ける: 初学者がつまづく構造的な原因
Avatar for PADAone pd1xx
1
710
dotfiles 式年遷宮 令和最新版
Avatar for masawada masawada
1
760
Cap'n Webについて
Avatar for Yusuke Wada yusukebe
0
130
Developing static sites with Ruby
Avatar for Masafumi Okura okuramasafumi
0
270
Cell-Based Architecture
Avatar for Luram Archanjo larchanjo
0
110
Rediscover the Console - SymfonyCon Amsterdam 2025
Avatar for Robin Chalas chalasr
2
160
これだけで丸わかり！LangChain v1.0 アップデートまとめ
Avatar for os1ma os1ma
6
1.8k
Microservices rules: What good looks like
Avatar for Chris Richardson cer
PRO
0
1.3k
AIエンジニアリングのご紹介 / Introduction to AI Engineering
Avatar for r-kagaya rkaga
5
2k
AIコーディングエージェント（Gemini）
Avatar for kondai kondai24
0
210
関数実行の裏側では何が起きているのか？
Avatar for minop1205 minop1205
1
690

Featured

See All Featured
Building an army of robots
Avatar for Kyle Neath kneath
306
46k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
Avatar for Dan Newman danielanewman
231
22k
Embracing the Ebb and Flow
Avatar for Simon Collison colly
88
4.9k
Making the Leap to Tech Lead
Avatar for Ryan Cromwell cromwellryan
135
9.7k
Fantastic passwords and where to find them - at NoRuKo
Avatar for Phil Nash philnash
52
3.5k
The Hidden Cost of Media on the Web [PixelPalooza 2025]
Avatar for Tammy Everts tammyeverts
1
98
Into the Great Unknown - MozCon
Avatar for Noah Learner thekraken
40
2.2k
Docker and Python
Avatar for Tania Allard trallard
47
3.7k
RailsConf 2023
Avatar for Aaron Patterson tenderlove
30
1.3k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
36
6.2k
Building a Scalable Design System with Sketch
Avatar for Laura Van Doore lauravandoore
463
34k
Optimising Largest Contentful Paint
Avatar for Harry Roberts csswizardry
37
3.5k

Transcript

  1. Git hygiene Forward First Tuesdays 01/05/2012 Wednesday, 2 May 12

  2. The problem Wednesday, 2 May 12

  3. Wednesday, 2 May 12

  4. merge foobars + messy tree Wednesday, 2 May 12

  5. Solution Wednesday, 2 May 12

  6. avoid large merges: git pull --rebase ATFT Wednesday, 2 May

    12

  7. git commit often Wednesday, 2 May 12

  8. http://whatthecommit.com/ Wednesday, 2 May 12

  9. git push often (after git pull --rebase!) Wednesday, 2 May

    12

  10. disruptive features Wednesday, 2 May 12

  11. 1. feature branches Wednesday, 2 May 12

  12. squash commits (git rebase -i) git merge -no-ff Wednesday, 2

    May 12

  13. Wednesday, 2 May 12

  14. 2. keep it in master switch the feature on or

    off in the code Wednesday, 2 May 12

  15. Conclusion: - avoid errors - an expressive git tree Wednesday,

    2 May 12

  16. ... Doesn’t take a lot of effort! Wednesday, 2 May

    12