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

git hygiene

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
280
Data Driven Development
Avatar for elise_huard elise_huard
3
470
Ruby goes to Hollywood
Avatar for elise_huard elise_huard
1
590

Other Decks in Programming

See All in Programming
Getting Started with Vibe Coding
Avatar for Michael Cheng miccheng
0
150
そのデザイントークン、Flutterでも同じ見た目になりますか？
Avatar for nakamizu nakamizu
0
240
コーディング自動化の次へ。人の介入をゼロにするファクトリーとサポートAIによる実践
Avatar for Seiji Takahashi timakin
5
5k
高橋メソッドでCVE解説シリーズ 〜CVE-2026-112816〜
Avatar for Hakkadaikon hakkadaikon
0
180
AI Augmentation Techniques with Liberty
Avatar for ivargrimstad ivargrimstad
0
250
Spec-driven Development with AI
Avatar for Simon Martinelli simas
PRO
0
2.2k
선언형 햅틱 라이브러리 진동을 소개합니다
Avatar for HyunWoo Lee l2hyunwoo
1
250
느린 네트워크와 저사양 디바이스 사용자를 위한 웹뷰 로딩 시간 개선기
Avatar for kmkim kmkim
0
120
個人開発者よ、Honoを使え（おじさんver）
Avatar for tanahiro2010 tanahiro2010
2
300
우리의 Nitro Modules는 당신의 Turbo Modules보다 아름답다
Avatar for HyunWoo Lee l2hyunwoo
0
250
Event is what happens
Avatar for MOROHASHI Kyosuke moro
2
2.8k
Optunaを作ったときにやりたかったこと、その後 (2026/10/16, Optuna Meetup #3)
Avatar for Takuya Akiba iwiwi
4
1.4k

Featured

See All Featured
Noah Learner - AI + Me: how we built a GSC Bulk Export data pipeline
Avatar for Tech SEO Connect techseoconnect
PRO
0
470
10 Git Anti Patterns You Should be Aware of
Avatar for Lemi Orhan Ergin lemiorhan
PRO
659
62k
Design in an AI World
Avatar for tapps tapps
1
380
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
Avatar for mongodb mongodb
50
10k
How to build an LLM SEO readiness audit: a practical framework
Avatar for Nick Samuel nmsamuel
2
970
How to Get Subject Matter Experts Bought In and Actively Contributing to SEO & PR Initiatives.
Avatar for Liv Day livdayseo
0
240
First, design no harm
Avatar for Per Axbom axbom
PRO
2
1.4k
Rebuilding a faster, lazier Slack
Avatar for samanthasiow samanthasiow
85
9.7k
A brief & incomplete history of 
UX Design for the World Wide Web: 1989–2019
Avatar for Jason CranfordTeague jct
2
550
The #1 spot is gone: here's how to win anyway
Avatar for Tamara Novitovic tamaranovitovic
4
1.2k
Put a Button on it: Removing Barriers to Going Fast.
Avatar for kastner kastner
60
4.6k
Stewardship and Sustainability of Urban and Community Forests
Avatar for Eric Wiseman pwiseman
0
580

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