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

git hygiene

elise_huard
May 02, 2012
Programming
3
400

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
160
Ruby's bin men
elise_huard
2
970
data driven development
elise_huard
5
250
Data Driven Development
elise_huard
3
440
Ruby goes to Hollywood
elise_huard
1
530

Other Decks in Programming

See All in Programming
データベースエンジニアの仕事を楽にする。PgAssistantの紹介
nnaka2992
9
4.4k
AIコーディングワークフローの試行 〜AIエージェント×ワークフローでの自動化を目指して〜
rkaga
2
1.5k
Modern Angular: Renovation for Your Applications @angularDays 2025 Munich
manfredsteyer
PRO
0
160
AWSで雰囲気でつくる! VRChatの写真変換ピタゴラスイッチ
anatofuz
0
110
コンテナでLambdaをデプロイするときに知っておきたかったこと
_takahash
0
170
Being an ethical software engineer
xgouchet
PRO
0
150
趣味全開のAITuber開発
kokushin
0
170
Boost Your Performance and Developer Productivity with Jakarta EE 11
ivargrimstad
0
680
ベクトル検索システムの気持ち
monochromegane
30
9.6k
AI Coding Agent Enablement - エージェントを自走させよう
yukukotani
12
4.2k
Kamal 2 – Get Out of the Cloud
aleksandrov
1
150
Building Scalable Mobile Projects: Fast Builds, High Reusability and Clear Ownership
cyrilmottier
1
100

Featured

See All Featured
Optimizing for Happiness
mojombo
377
70k
Mobile First: as difficult as doing things right
swwweet
223
9.5k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
smashingmag
251
21k
Gamification - CAS2011
davidbonilla
81
5.2k
GitHub's CSS Performance
jonrohan
1030
460k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
233
17k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
46
2.4k
Java REST API Framework Comparison - PWX 2021
mraible
29
8.5k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
331
21k
Making the Leap to Tech Lead
cromwellryan
133
9.2k
VelocityConf: Rendering Performance Case Studies
addyosmani
328
24k
Learning to Love Humans: Emotional Interface Design
aarron
273
40k

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