Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

git hygiene

Avatar for elise_huard elise_huard
May 02, 2012
Programming
430
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
220
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
560
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
590

Other Decks in Programming

See All in Programming
残高管理から台帳サービスへの進化
Avatar for kobaryo artoy
0
180
wkhtmltopdfの次どうするか問題2026
Avatar for Shinichi Maeshima willnet
2
1.9k
Simple Storage Service(S3) is not simple
Avatar for Yura Iwatsuka iwatsukayura
0
250
[2026-09-26]空論ジェネリックプロセス～テスト資産とAIで紡ぐ、再現可能なパフォーマンスチューニングの話～
Avatar for tosite tosite
0
260
iOS 27でニュースアプリはどう変わる！？ 〜日経電子版の新機能対応と、開発事例から〜
Avatar for Kazuki Nakashima lynnswap
7
13k
AI主導のプログラミング学習アプリを作ってみた
Avatar for econanringo econanringo
0
160
[ハンズオン]AIへの指示だけで「五目並べ」を作ってみよう
Avatar for Satoshi Kaneyasu satoshi256kbyte
1
370
Augmenting AI with the Power of Jakarta EE
Avatar for ivargrimstad ivargrimstad
0
620
Unity6 URPによる海底をテーマにしたVJシステムの解説 | Unity Shader 完全に理解した 勉強会
Avatar for がむ gam0022
0
350
RAG の “R” を Swift で覗いてみる 〜「意味から探す」検索の仕組み〜
Avatar for Nao-RandD nao_randd
0
140
見えないものを探る要求要件定義に必要な基本的思考 / invisible-requirement-thinking
Avatar for MinoDriven minodriven
15
8.2k
GemmaをJevのように使ってみる / Use Gemma like Jev
Avatar for Naoki Kishida kishida
5
760

Featured

See All Featured
Darren the Foodie - Storyboard
Avatar for Kevinho.art khoart
PRO
4
4k
Digital Ethics as a Driver of Design Innovation
Avatar for Per Axbom axbom
PRO
1
450
A Soul's Torment
Avatar for Nat Ma seathinner
8
3.7k
Between Models and Reality
Avatar for mayunak mayunak
4
490
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
Avatar for Vitaly Friedman smashingmag
254
22k
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
7k
Lightning Talk: Beautiful Slides for Beginners
Avatar for Ines Montani inesmontani
PRO
2
720
What’s in a name? Adding method to the madness
Avatar for The Alliance productmarketing
PRO
24
4.2k
JAMstack: Web Apps at Ludicrous Speed - All Things Open 2022
Avatar for David Neal reverentgeek
1
630
Navigating the Design Leadership Dip - Product Design Week Design Leaders+ Conference 2024
Avatar for Andy Polaine apolaine
2
470
16th Malabo Montpellier Forum Presentation
Avatar for AKADEMIYA2063 akademiya2063
PRO
0
400
Getting science done with accelerated Python computing platforms
Avatar for Jacob Tomlinson jacobtomlinson
2
530

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