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
180
Game in Haskell at Strangeloop 2014
elise_huard
4
510
Functional Programming is the new black
elise_huard
4
1.2k
Tracing your way through Ruby
elise_huard
4
530
Ruby's bin men
elise_huard
1
150
Ruby's bin men
elise_huard
2
960
data driven development
elise_huard
5
250
Data Driven Development
elise_huard
3
430
Ruby goes to Hollywood
elise_huard
1
530

Other Decks in Programming

See All in Programming
自力でTTSモデルを作った話
zgock999
0
120
もう少しテストを書きたいんじゃ〜 #phpstudy
o0h
PRO
21
4.3k
Rubyと自由とAIと
yotii23
6
1.9k
sappoRo.R #12 初心者セッション
kosugitti
0
280
kintone開発を効率化するためにチームで試した施策とその結果を大放出！
oguemon
0
340
Domain-Driven Design (Tutorial)
hschwentner
13
22k
技術を改善し続ける
gumioji
0
180
SwiftUI Viewの責務分離
elmetal
PRO
2
280
責務と認知負荷を整える! 抽象レベルを意識した関心の分離
yahiru
9
1.5k
AWS Step Functions は CDK で書こう！
konokenj
5
880
Django NinjaによるAPI開発の効率化とリプレースの実践
kashewnuts
1
300
CDKを使ったPagerDuty連携インフラのテンプレート化
shibuya_shogo
0
120

Featured

See All Featured
Typedesign – Prime Four
hannesfritz
41
2.5k
GraphQLの誤解/rethinking-graphql
sonatard
69
10k
The Cost Of JavaScript in 2023
addyosmani
47
7.4k
Building Your Own Lightsaber
phodgson
104
6.2k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
366
25k
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
28
9.3k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
47
5.2k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
21
2.5k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
11
1.3k
The Illustrated Children's Guide to Kubernetes
chrisshort
48
49k
Site-Speed That Sticks
csswizardry
4
420
Statistics for Hackers
jakevdp
797
220k

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