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
400

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
190
Game in Haskell at Strangeloop 2014
Avatar for elise_huard elise_huard
4
510
Functional Programming is the new black
Avatar for elise_huard elise_huard
4
1.2k
Tracing your way through Ruby
Avatar for elise_huard elise_huard
4
530
Ruby's bin men
Avatar for elise_huard elise_huard
1
160
Ruby's bin men
Avatar for elise_huard elise_huard
2
980
data driven development
Avatar for elise_huard elise_huard
5
260
Data Driven Development
Avatar for elise_huard elise_huard
3
440
Ruby goes to Hollywood
Avatar for elise_huard elise_huard
1
540

Other Decks in Programming

See All in Programming
ふつうの技術スタックでアート作品を作ってみる
Avatar for Akira Yagi akira888
1
840
AIと”コードの評価関数”を共有する / Share the "code evaluation function" with AI
Avatar for Shintani Teppei euglena1215
1
160
VS Code Update for GitHub Copilot
Avatar for 74th(Atsushi Morimoto) 74th
2
640
20250704_教育事業におけるアジャイルなデータ基盤構築
Avatar for Uchide Hiroki(ucchi-) hanon52_
5
790
PHPで始める振る舞い駆動開発(Behaviour-Driven Development)
Avatar for uutan1108 ohmori_yusuke
2
390
PostgreSQLのRow Level SecurityをPHPのORMで扱う Eloquent vs Doctrine #phpcon #track2
Avatar for Hiromi Hishida 77web
2
530
Hack Claude Code with Claude Code
Avatar for Akihiro Okuno choplin
4
2k
ニーリーにおけるプロダクトエンジニア
Avatar for Nealle nealle
0
830
AI時代のソフトウェア開発を考える（2025/07版） / Agentic Software Engineering Findy 2025-07 Edition
Avatar for Takuto Wada twada
PRO
86
29k
AI コーディングエージェントの時代へ：JetBrains が描く開発の未来
Avatar for Masaru Horioka masaruhr
1
150
Porting a visionOS App to Android XR
Avatar for Akio Itaya akkeylab
0
460
“いい感じ“な定量評価を求めて - Four Keysとアウトカムの間の探求 -
Avatar for Nealle nealle
1
10k

Featured

See All Featured
Build The Right Thing And Hit Your Dates
Avatar for Maggie C. maggiecrowley
36
2.8k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
Avatar for Vitaly Friedman smashingmag
251
21k
A better future with KSS
Avatar for Kyle Neath kneath
238
17k
Raft: Consensus for Rubyists
Avatar for Patrick Van Stee vanstee
140
7k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
Avatar for Michelle Schulp Hunt marktimemedia
31
2.4k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
Avatar for Addy Osmani addyosmani
7
740
GraphQLとの向き合い方2022年版
Avatar for Yosuke Kurami quramy
49
14k
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
30
5.9k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
Avatar for soudai sone soudai
PRO
181
54k
The Art of Programming - Codeland 2020
Avatar for Erika Heidi erikaheidi
54
13k
Building a Modern Day 
E-commerce SEO Strategy
Avatar for Aleyda Solis aleyda
42
7.4k
Facilitating Awesome Meetings
Avatar for Lara Hogan lara
54
6.4k

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