Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
git hygiene
Search
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
Share
More Decks by elise_huard
See All by elise_huard
FRP in games
elise_huard
0
170
Game in Haskell at Strangeloop 2014
elise_huard
4
500
Functional Programming is the new black
elise_huard
4
1.2k
Tracing your way through Ruby
elise_huard
4
510
Ruby's bin men
elise_huard
1
140
Ruby's bin men
elise_huard
2
920
data driven development
elise_huard
5
250
Data Driven Development
elise_huard
3
430
Ruby goes to Hollywood
elise_huard
1
500
Other Decks in Programming
See All in Programming
Goのmultiple errorsについて (2024年4月版)
syumai
4
1.2k
SIMD Parallel Programming with the Vector API
josepaumard
0
230
Build Apps for iOS, Android & Desktop in 100% Kotlin With Compose Multiplatform (mDevCamp 2024)
zsmb
0
460
slow types ってなんだろう?
karad
0
100
Netty Chicago Java User Group 2024-04-17
sullis
0
200
Ruby GitHub Packages
bkuhlmann
0
640
TCAとKMPを用いた新規動画配信アプリ 「ABEMA Live」の設計
tomu28
2
130
デフォルトにして至高、RubyMineの大好きな所
ruzia
0
840
Code Reviews
bkuhlmann
4
900
CA.swift19 恋するAIアプリ開発の裏側
oskmr
0
380
Documentation for users with AsciiDoc and Antora
ahus1
0
370
AWS CDKコントリビュートTIPS / aws-cdk-contribution-tips
gotok365
4
400
Featured
See All Featured
The MySQL Ecosystem @ GitHub 2015
samlambert
244
12k
Automating Front-end Workflow
addyosmani
1357
200k
Reflections from 52 weeks, 52 projects
jeffersonlam
345
19k
Faster Mobile Websites
deanohume
300
30k
Music & Morning Musume
bryan
41
5.6k
Statistics for Hackers
jakevdp
790
220k
[RailsConf 2023] Rails as a piece of cake
palkan
28
4k
Why Our Code Smells
bkeepers
PRO
331
56k
Into the Great Unknown - MozCon
thekraken
15
1k
Happy Clients
brianwarren
92
6.4k
How to train your dragon (web standard)
notwaldorf
75
5.2k
The Language of Interfaces
destraynor
151
23k
Transcript
Git hygiene Forward First Tuesdays 01/05/2012 Wednesday, 2 May 12
The problem Wednesday, 2 May 12
Wednesday, 2 May 12
merge foobars + messy tree Wednesday, 2 May 12
Solution Wednesday, 2 May 12
avoid large merges: git pull --rebase ATFT Wednesday, 2 May
12
git commit often Wednesday, 2 May 12
http://whatthecommit.com/ Wednesday, 2 May 12
git push often (after git pull --rebase!) Wednesday, 2 May
12
disruptive features Wednesday, 2 May 12
1. feature branches Wednesday, 2 May 12
squash commits (git rebase -i) git merge -no-ff Wednesday, 2
May 12
Wednesday, 2 May 12
2. keep it in master switch the feature on or
off in the code Wednesday, 2 May 12
Conclusion: - avoid errors - an expressive git tree Wednesday,
2 May 12
... Doesn’t take a lot of effort! Wednesday, 2 May
12