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
2024年のkintone API振り返りと2025年 / kintone API look back in 2024
tasshi
0
160
Fibonacci Function Gallery - Part 2
philipschwarz
PRO
0
220
自動で //nolint を挿入する取り組み / Gopher's Gathering
utgwkk
1
150
traP の部内 ISUCON とそれを支えるポータル / PISCON Portal
ikura_hamu
0
230
混沌とした例外処理とエラー監視に秩序をもたらす
morihirok
18
3k
動作確認やテストで漏れがちな観点3選
starfish719
5
570
ecspresso, ecschedule, lambroll を PipeCDプラグインとして動かしてみた （プロトタイプ）　/ Running ecspresso, ecschedule, and lambroll as PipeCD Plugins (prototype)
tkikuc
2
2.1k
2,500万ユーザーを支えるSREチームの6年間のスクラムのカイゼン
honmarkhunt
6
3.4k
BEエンジニアがFEの業務をできるようになるまでにやったこと
yoshida_ryushin
0
250
HTML/CSS超絶浅い説明
yuki0329
0
200
Immutable ActiveRecord
megane42
0
110
[JAWS-UG横浜 #79] re:Invent 2024 の DB アップデートは Multi-Region！
maroon1st
0
120

Featured

See All Featured
GraphQLの誤解/rethinking-graphql
sonatard
68
10k
Designing for Performance
lara
604
68k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
addyosmani
3
260
Building a Modern Day 
E-commerce SEO Strategy
aleyda
38
7.1k
10 Git Anti Patterns You Should be Aware of
lemiorhan
PRO
656
59k
Visualization
eitanlees
146
15k
Fashionably flexible responsive web design (full day workshop)
malarkey
406
66k
Adopting Sorbet at Scale
ufuk
74
9.2k
YesSQL, Process and Tooling at Scale
rocio
170
14k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
330
21k
Side Projects
sachag
452
42k
Done Done
chrislema
182
16k

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