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

git hygiene

elise_huard
May 02, 2012
Programming
3
390

git hygiene

a small description of how to keep your git tree tidy

elise_huard

May 02, 2012
Tweet

More Decks by elise_huard

See All by elise_huard
FRP in games
elise_huard
0
170
Game in Haskell at Strangeloop 2014
elise_huard
4
500
Functional Programming is the new black
elise_huard
4
1.2k
Tracing your way through Ruby
elise_huard
4
510
Ruby's bin men
elise_huard
1
140
Ruby's bin men
elise_huard
2
920
data driven development
elise_huard
5
250
Data Driven Development
elise_huard
3
430
Ruby goes to Hollywood
elise_huard
1
500

Other Decks in Programming

See All in Programming
大規模UIKitベースアプリへのTCAの段階的導入/gradual-adoption-of-tca-in-a-large-scale-uikit-based-app
takehilo
2
190
Code Reviews
bkuhlmann
4
890
Rubyでたのしむクリエイティブコーディング/Enjoy Creative coding with Ruby
chobishiba
1
210
Site Reliability Engineering for GMO
pyama86
8
1.1k
雑に思考を整理する技術と効能
konifar
61
30k
Netty Chicago Java User Group 2024-04-17
sullis
0
190
From Spring Boot 2 to Spring Boot 3 with Java 21 and Jakarta EE
ivargrimstad
0
280
Snowflakeで眠ったデータを起こそう！
estie
0
130
デフォルトにして至高、RubyMineの大好きな所
ruzia
0
550
Elm 0.19.0 Changes
bkuhlmann
0
490
try! Swift Tokyo 初参加報告LT
hinakko2
0
230
Amazon SQSコンシューマー疎結合への旅 - 出張！ #DevelopersIO IT技術ブログの中の人が語る勉強会 #3
quiver
0
290

Featured

See All Featured
Gamification - CAS2011
davidbonilla
76
4.6k
Optimizing for Happiness
mojombo
370
69k
Visualization
eitanlees
137
14k
What's new in Ruby 2.0
geeforr
337
31k
Fantastic passwords and where to find them - at NoRuKo
philnash
38
2.5k
Building a Modern Day 
E-commerce SEO Strategy
aleyda
20
6.4k
The Illustrated Children's Guide to Kubernetes
chrisshort
32
46k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
10
1.5k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
660
120k
Navigating Team Friction
lara
179
13k
It's Worth the Effort
3n
180
27k
Imperfection Machines: The Place of Print at Facebook
scottboms
261
12k

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