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
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
950
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
AWS IaCの注目アップデート 2024年10月版
konokenj
3
3.1k
What’s New in Compose Multiplatform - A Live Tour (droidcon London 2024)
zsmb
1
350
VR HMDとしてのVision Pro＋ゲーム開発について
yasei_no_otoko
0
100
約9000個の自動テストの 時間を50分->10分に短縮 Flakyテストを1%以下に抑えた話
hatsu38
23
11k
CSC305 Lecture 13
javiergs
PRO
0
130
Pinia Colada が実現するスマートな非同期処理
naokihaba
2
160
gopls を改造したら開発生産性が高まった
satorunooshie
8
240
現場で役立つモデリング　超入門
masuda220
PRO
13
2.9k
C#/.NETのこれまでのふりかえり
tomokusaba
1
160
JaSST 24 九州：ワークショップ(は除く) 実践！マインドマップを活用したソフトウェアテスト＋活用事例
satohiroyuki
0
270
GCCのプラグインを作る / I Made a GCC Plugin
shouth
1
150
讓數據說話：用 Python、Prometheus 和 Grafana 講故事
eddie
0
350

Featured

See All Featured
Build your cross-platform service in a week with App Engine
jlugia
229
18k
Building Your Own Lightsaber
phodgson
102
6.1k
Typedesign – Prime Four
hannesfritz
39
2.4k
Six Lessons from altMBA
skipperchong
26
3.5k
GraphQLの誤解/rethinking-graphql
sonatard
66
9.9k
Designing Experiences People Love
moore
138
23k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
280
13k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
27
790
Designing for humans not robots
tammielis
249
25k
Rebuilding a faster, lazier Slack
samanthasiow
79
8.6k
Code Reviewing Like a Champion
maltzj
519
39k
Agile that works and the tools we love
rasmusluckow
327
21k

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