Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

git hygiene

Sponsored · Your Podcast. Everywhere. Effortlessly. Share. Educate. Inspire. Entertain. You do you. We'll handle the rest. →
Avatar for elise_huard elise_huard
May 02, 2012
Programming
430
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
220
Game in Haskell at Strangeloop 2014
Avatar for elise_huard elise_huard
4
550
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
560
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
590

Other Decks in Programming

See All in Programming
우리의 Nitro Modules는 당신의 Turbo Modules보다 아름답다
Avatar for HyunWoo Lee l2hyunwoo
0
180
JAWS-UG 東京支部が始める、JAWS-UG支部コラボ / JAWS-UG lunchtime LT Collaboration
Avatar for y-ohgi y0hgi
0
300
あなたの await、OS まで届いてる？ strace で覗く JavaScript の非同期
Avatar for hasuto sasaki hasutosasaki
1
1.2k
Jetpack Compose Mechanisms
Avatar for Jaewoong skydoves
3
860
GemmaをJevのように使ってみる / Use Gemma like Jev
Avatar for Naoki Kishida kishida
5
820
月間100万人のサービス刷新で、 技術選定をHonoに振り切った話
Avatar for bara yutobara
8
6.9k
當我們開始不讀 Code - AI Agent 時代，Code Review 與 Clean Code 還剩下什麼？
Avatar for James Wang jame2408
1
300
コードレビューのボトルネックを"する側"と"される側"の両面から解消する
Avatar for yub0n yub0n
2
1.7k
Railsバージョンを4倍にした話
Avatar for OPTiM optim
0
540
IBM Bob Dojo #1 仕様駆動開発入門
Avatar for Akira Onishi (IBM) oniak3ibm
PRO
0
420
re:Inventに行く前に知っておきたい現地参加のノウハウ
Avatar for nokomoro3 nokomoro3
0
460
最近”作らせてる” ローカルAIアプリの話
Avatar for ITO Akihiro akit37
0
490

Featured

See All Featured
Conquering PDFs: document understanding beyond plain text
Avatar for Ines Montani inesmontani
PRO
4
3.2k
Dominate Local Search Results - an insider guide to GBP, reviews, and Local SEO
Avatar for Greg Gifford greggifford
PRO
0
380
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
7k
SEO in 2025: How to Prepare for the Future of Search
Avatar for Michael King ipullrank
3
3.9k
Building a A Zero-Code AI SEO Workflow
Avatar for Ian Lurie portentint
PRO
0
790
Mozcon NYC 2025: Stop Losing SEO Traffic
Avatar for Sam Torres samtorres
1
580
The Pragmatic Product Professional
Avatar for Laura Van Doore lauravandoore
37
7.5k
How to train your dragon (web standard)
Avatar for Monica Dinculescu notwaldorf
96
6.9k
Fireside Chat
Avatar for paigeccino paigeccino
43
4.1k
Typedesign – Prime Four
Avatar for Hannes Fritz hannesfritz
42
3.2k
The Curious Case for Waylosing
Avatar for Cassini Nazir cassininazir
1
570
Beyond borders and beyond the search box: How to win the global "messy middle" with AI-driven SEO
Avatar for David Carrasco davidcarrasco
3
280

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