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
Speedy Git
Search
Paul McGrath
June 10, 2017
Programming
1
71
Speedy Git
How to increase the speed from brain to/from git
Paul McGrath
June 10, 2017
Tweet
Share
More Decks by Paul McGrath
See All by Paul McGrath
Docker101 Workshop
paulmcgrath
2
100
What can I do with that Raspberry Pi?
paulmcgrath
0
51
Untrusted Data: SQL injection and XSS
paulmcgrath
0
56
Faster Software Delivery - Dan North
paulmcgrath
1
65
Design Patterns Club
paulmcgrath
0
67
Other Decks in Programming
See All in Programming
Amazon Bedrock Multi Agentsを試してきた
tm2
1
280
技術を根付かせる / How to make technology take root
kubode
1
240
AWSマネコンに複数のアカウントで入れるようになりました
yuhta28
2
160
第3回関東Kaggler会_AtCoderはKaggleの役に立つ
chettub
3
890
定理証明プラットフォーム lapisla.net
abap34
1
1.7k
テストをしないQAエンジニアは何をしているか?
nealle
0
130
SwiftUI Viewの責務分離
elmetal
PRO
0
140
2024年のWebフロントエンドのふりかえりと2025年
sakito
1
230
ISUCON14公式反省会LT: 社内ISUCONの話
astj
PRO
0
180
Introduction to kotlinx.rpc
arawn
0
630
How mixi2 Uses TiDB for SNS Scalability and Performance
kanmo
29
11k
『GO』アプリ データ基盤のログ収集システムコスト削減
mot_techtalk
0
110
Featured
See All Featured
How STYLIGHT went responsive
nonsquared
98
5.3k
Designing Dashboards & Data Visualisations in Web Apps
destraynor
231
53k
Fireside Chat
paigeccino
34
3.2k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
280
13k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
27
1.9k
XXLCSS - How to scale CSS and keep your sanity
sugarenia
248
1.3M
Build The Right Thing And Hit Your Dates
maggiecrowley
34
2.5k
4 Signs Your Business is Dying
shpigford
182
22k
The Success of Rails: Ensuring Growth for the Next 100 Years
eileencodes
44
7k
How to Ace a Technical Interview
jacobian
276
23k
Keith and Marios Guide to Fast Websites
keithpitt
411
22k
Unsuck your backbone
ammeep
669
57k
Transcript
Speedy Git Paul McGrath
Contents Speedy Input Speedy Visualisation Speedy Workflow
Speedy Commands git push master~2:master git pull –rebase
(git fetch origin, git rebase origin/master)
Speedy Commands Interactive rebase (rebase –i)
Speedy Aliases (.gitconfig)
Using your favourite text editor In ~/.bashrc and ~/bin
My editor is much easier to use for interactive rebase, commit –amend etc. Share your setup – it’s all config files
Console 2
Use your favourite log viewer ~/.bashrc:
mergetool, difftool setup
IF you have these problems… Features tied together
Can’t unpick the log Branching from untested code Your product is the sum of independent features Features can be easily removed You have a safe point to branch from
Git workflow Git docs: Branching strategy ( http://git-scm.com/book/en/v2/Git-Branch ing-Branching-Workflows
)
Not like this…
Create a safe branching point http:// scottchacon.com/2011/08/31/github-flow.html git
merge develop Keep it as light-weight as possible …Yeah, but what about conflicts? DEVELOP MASTER MY LOVELY FEATURE
Speedy Branches Avoiding conflicts Small commits merge
safe point into branches Even better… rebase! …Yeah, but I don’t want to see all these branches all over our repo…
Github forks
Speedy Integration
Speedy Git