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

git hygiene

Avatar for elise_huard elise_huard
May 02, 2012
Programming
3
410

git hygiene

a small description of how to keep your git tree tidy

Avatar for elise_huard

elise_huard

May 02, 2012
Tweet

More Decks by elise_huard

See All by elise_huard
FRP in games
Avatar for elise_huard elise_huard
0
200
Game in Haskell at Strangeloop 2014
Avatar for elise_huard elise_huard
4
520
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
540
Ruby's bin men
Avatar for elise_huard elise_huard
1
170
Ruby's bin men
Avatar for elise_huard elise_huard
2
990
data driven development
Avatar for elise_huard elise_huard
5
260
Data Driven Development
Avatar for elise_huard elise_huard
3
450
Ruby goes to Hollywood
Avatar for elise_huard elise_huard
1
550

Other Decks in Programming

See All in Programming
Coding at the Speed of Thought: The New Era of Symfony Docker
Avatar for Kévin Dunglas dunglas
0
3.4k
PHP でエミュレータを自作して Ubuntu を動かそう
Avatar for memory m3m0r7
PRO
2
150
ネイティブアプリとWebフロントエンドのAPI通信ラッパーにおける共通化の勘所
Avatar for Suguru Ohki suguruooki
0
230
飯MCP
Avatar for Yusuke Wada yusukebe
0
420
存在論的プログラミング： 時間と存在を記述する
Avatar for Akihito Koriyama koriym
5
580
「効かない！」依存性注入（DI）を活用したAPI Platformのエラーハンドリング奮闘記
Avatar for Maki Hayashi mkmk884
0
280
Kubernetesでセルフホストが簡単なNewSQLを求めて / Seeking a NewSQL Database That's Simple to Self-Host on Kubernetes
Avatar for nnaka2992 nnaka2992
0
190
What Spring Developers Should Know About Jakarta EE
Avatar for ivargrimstad ivargrimstad
0
800
Geminiをパートナーに神社DXシステムを個人開発した話（いなめぐDX 開発振り返り）
Avatar for T. Fujiba fujiba
0
120
Strategy for Finding a Problem for OSS: With Real Examples
Avatar for Chikahiro Tokoro kibitan
0
130
CS教育のDX AIによる育成の効率化
Avatar for ニフティ株式会社 niftycorp
PRO
0
170
AI活用のコスパを最大化する方法
Avatar for Ochtum ochtum
0
360

Featured

See All Featured
VelocityConf: Rendering Performance Case Studies
Avatar for Addy Osmani addyosmani
333
24k
Prompt Engineering for Job Search
Avatar for Mfonobong Umondia mfonobong
0
240
More Than Pixels: Becoming A User Experience Designer
Avatar for Michelle Schulp Hunt marktimemedia
3
360
Fireside Chat
Avatar for paigeccino paigeccino
42
3.9k
Documentation Writing (for coders)
Avatar for Carmen Chung carmenintech
77
5.3k
Kristin Tynski - Automating Marketing Tasks With AI
Avatar for Tech SEO Connect techseoconnect
PRO
0
200
Bridging the Design Gap: How Collaborative Modelling removes blockers to flow between stakeholders and teams @FastFlow conf
Avatar for Kenny Baas-Schwegler baasie
0
500
Claude Code のすすめ
Avatar for schroneko schroneko
67
220k
GitHub's CSS Performance
Avatar for Jon Rohan jonrohan
1032
470k
Odyssey Design
Avatar for Ryan Kendrick rkendrick25
PRO
2
560
Evolving SEO for Evolving Search Engines
Avatar for Ryan Jones ryanjones
0
170
Save Time (by Creating Custom Rails Generators)
Avatar for Garrett Dimon garrettdimon
PRO
32
2.6k

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