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
180
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
960
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
Stackless и stackful? Корутины и асинхронность в Go
lamodatech
0
1.3k
DevinとCursorから学ぶAIエージェントメモリーの設計とMoatの考え方
itarutomy
0
150
PHPUnitしか使ってこなかった 一般PHPerがPestに乗り換えた実録
mashirou1234
0
420
Alba: Why, How and What's So Interesting
okuramasafumi
0
210
Jaspr Dart Web Framework 박제창 @Devfest 2024
itsmedreamwalker
0
150
QA環境で誰でも自由自在に現在時刻を操って検証できるようにした話
kalibora
1
140
サーバーゆる勉強会 DBMS の仕組み編
kj455
1
310
Асинхронность неизбежна: как мы проектировали сервис уведомлений
lamodatech
0
1.4k
Beyond ORM
77web
11
1.6k
AWS re:Invent 2024個人的まとめ
satoshi256kbyte
0
110
ISUCON14感想戦で85万点まで頑張ってみた
ponyo877
1
600
カンファレンス動画鑑賞会のススメ / Osaka.swift #1
hironytic
0
180

Featured

See All Featured
The Straight Up "How To Draw Better" Workshop
denniskardys
232
140k
Building Your Own Lightsaber
phodgson
104
6.2k
Adopting Sorbet at Scale
ufuk
74
9.2k
KATA
mclloyd
29
14k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
232
17k
Art, The Web, and Tiny UX
lynnandtonic
298
20k
Unsuck your backbone
ammeep
669
57k
RailsConf 2023
tenderlove
29
970
Large-scale JavaScript Application Architecture
addyosmani
510
110k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
666
120k
Why You Should Never Use an ORM
jnunemaker
PRO
54
9.1k
Fashionably flexible responsive web design (full day workshop)
malarkey
406
66k

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