Upgrade to Pro — share decks privately, control downloads, hide ads and more …

git hygiene

Avatar for elise_huard elise_huard
May 02, 2012
Programming
420
3

git hygiene

a small description of how to keep your git tree tidy

Avatar for elise_huard

elise_huard

May 02, 2012

More Decks by elise_huard

See All by elise_huard
FRP in games
Avatar for elise_huard elise_huard
0
210
Game in Haskell at Strangeloop 2014
Avatar for elise_huard elise_huard
4
530
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
550
Ruby's bin men
Avatar for elise_huard elise_huard
1
180
Ruby's bin men
Avatar for elise_huard elise_huard
2
1k
data driven development
Avatar for elise_huard elise_huard
5
270
Data Driven Development
Avatar for elise_huard elise_huard
3
460
Ruby goes to Hollywood
Avatar for elise_huard elise_huard
1
560

Other Decks in Programming

See All in Programming
Dataformのリポジトリを立ち上げるときにまずやること / dataform-day0-2026
Avatar for snhryt snhryt
0
170
C# and C++ Interoperability - cho-dotnetnew
Avatar for Akiko Kawai harukasao
0
140
ECSアプリログをFireLensでコスト削減しようとしたけど諦めた話 in Fargate×Node.js
Avatar for アキキー | Akihisa Ikeda akihisaikeda
2
4.2k
LLM本来の能力を解き放つサンドボックス技術とAI民主化への適用
Avatar for Yuku Kotani yukukotani
3
4.2k
Inside Stream API
Avatar for Yuichi.Sakuraba skrb
1
730
Even G2とAWSで推しのエージェントを召喚しよう！
Avatar for Har1101 har1101
1
120
The NotImplementedError Problem in Ruby
Avatar for Koichi ITO koic
1
810
TAKTでAI駆動開発の品質を設計する
Avatar for かとじゅん j5ik2o
7
1.3k
Spec Driven Development | AI Summit Lisbon
Avatar for Daniel Sogl danielsogl
PRO
0
190
AIで効率化できた業務・日常
Avatar for Ochtum ochtum
0
140
New "Type" system on PicoRuby
Avatar for pocke pocke
1
960
不変条件と整合性境界—ビジネスが決める設計判断と実現パターン / Invariants and Consistency Boundaries
Avatar for nrs nrslib
13
5.4k

Featured

See All Featured
Scaling GitHub
Avatar for Zach Holman holman
464
140k
How Fast Is Fast Enough? [PerfNow 2025]
Avatar for Tammy Everts tammyeverts
3
610
The Straight Up "How To Draw Better" Workshop
Avatar for Dennis Kardys denniskardys
239
140k
Navigating the moral maze — ethical principles for Al-driven product design
Avatar for Skipper Chong Warson skipperchong
2
390
Code Reviewing Like a Champion
Avatar for maltzj maltzj
528
40k
Bootstrapping a Software Product
Avatar for Garrett Dimon garrettdimon
PRO
307
120k
Git: the NoSQL Database
Avatar for Brandon Keepers bkeepers
PRO
432
67k
The agentic SEO stack - context over prompts
Avatar for schlessera schlessera
0
820
Lessons Learnt from Crawling 1000+ Websites
Avatar for Charles Meaden charlesmeaden
PRO
1
1.3k
We Are The Robots
Avatar for Honza Javorek honzajavorek
0
250
Leo the Paperboy
Avatar for Maya Tellez mayatellez
7
1.8k
The Director’s Chair: Orchestrating AI for Truly Effective Learning
Avatar for Mike Taylor tmiket
1
200

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