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

git hygiene

Avatar for elise_huard elise_huard
May 02, 2012
Programming
420
3

git hygiene

a small description of how to keep your git tree tidy

Avatar for elise_huard

elise_huard

May 02, 2012

More Decks by elise_huard

See All by elise_huard
FRP in games
Avatar for elise_huard elise_huard
0
210
Game in Haskell at Strangeloop 2014
Avatar for elise_huard elise_huard
4
540
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
550
Ruby's bin men
Avatar for elise_huard elise_huard
1
180
Ruby's bin men
Avatar for elise_huard elise_huard
2
1k
data driven development
Avatar for elise_huard elise_huard
5
270
Data Driven Development
Avatar for elise_huard elise_huard
3
460
Ruby goes to Hollywood
Avatar for elise_huard elise_huard
1
580

Other Decks in Programming

See All in Programming
まずはプロンプトガイドを読もう、話はそれからだ
Avatar for Akira TSURUDA kiakiraki
1
200
[PyCon KR 2026] More Variants, More Diversity for AI Accelerators
Avatar for Joongi Kim achimnol
0
110
S3 を使うアプリケーションをローカル完結で動かすことに全力を注いでみた / Running S3 Apps Offline
Avatar for Daisuke Garaike contour_gara
0
590
Discordを用いたラボオートメーション関連情報収集の自動化
Avatar for noguhiro2002 noguhiro2002
0
410
レビュー履歴をAIに食わせて、 Compose移行を加速するs
Avatar for Yuki Shiho shihochan
0
200
How I Won Prize Money at a Hackathon Using Codex and Symphony Alpha
Avatar for yasei no otoko yasei_no_otoko
0
120
自動化したのに回らない テスト運用の壁 ―AI時代の品質責任と生産性
Avatar for Masahiko Funaki(舟木 将彦) mfunaki
0
440
go-spidermonkeyでAIエージェントのCode Modeを実装する
Avatar for syumai syumai
2
990
夏だ！祭りだ！祭りとはドメインモデリングでは？
Avatar for ryugen04 ryugen04
0
370
tsc.rip を支える技術 / Kyoto.なんか #8
Avatar for Susisu susisu
0
160
Oxlintはいいぞ（続）
Avatar for Yuji Yamaguchi yug1224
1
420
AWS Transform Custom による Spring Boot 2.xから4.xへのVerUp
Avatar for Satoshi Kaneyasu satoshi256kbyte
2
100

Featured

See All Featured
AI Search: Implications for SEO and How to Move Forward - #ShenzhenSEOConference
Avatar for Aleyda Solis aleyda
1
1.3k
The Hidden Cost of Media on the Web [PixelPalooza 2025]
Avatar for Tammy Everts tammyeverts
2
470
Building Applications with DynamoDB
Avatar for Matt Wood mza
96
7.2k
Sam Torres - BigQuery for SEOs
Avatar for Tech SEO Connect techseoconnect
PRO
0
500
How Fast Is Fast Enough? [PerfNow 2025]
Avatar for Tammy Everts tammyeverts
3
800
The Curious Case for Waylosing
Avatar for Cassini Nazir cassininazir
1
480
JavaScript: Past, Present, and Future - NDC Porto 2020
Avatar for David Neal reverentgeek
52
6k
Rebuilding a faster, lazier Slack
Avatar for samanthasiow samanthasiow
85
9.6k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
Avatar for Morgane Peng morganepeng
133
19k
We Are The Robots
Avatar for Honza Javorek honzajavorek
0
310
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
38
3k
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
6.9k

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