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
68
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
81
What can I do with that Raspberry Pi?
paulmcgrath
0
48
Untrusted Data: SQL injection and XSS
paulmcgrath
0
52
Faster Software Delivery - Dan North
paulmcgrath
1
63
Design Patterns Club
paulmcgrath
0
67
Other Decks in Programming
See All in Programming
Debugging: All you need to know (for simultaneous interpreting)
jmatsu
2
800
オートマトン学習しろ / Do automata learning
makenowjust
3
130
大公開!iOS開発の悩みトップ5 〜iOSDC Japan 2024〜
ryunakayama
0
190
Developer Joy == Developer Productivity (really!)
hollycummins
1
220
Findy - エンジニア向け会社紹介 / Findy Letter for Engineers
findyinc
4
90k
エンジニア1年目で複雑なコードの改善に取り組んだ話
mtnmr
3
2k
Method Swizzlingを行うライブラリにおけるマルチモジュール設計
yoshikma
0
120
ドメイン駆動設計を実践するために必要なもの
bikisuke
4
330
Crafting Cross-Platform Adventures: Building a Game Engine with Kotlin Multiplatform
dwursteisen
0
120
GraphQLの魅力を引き出すAndroidクライアント実装
morux2
3
680
Why Prism?
kddnewton
4
1.7k
Ebitengineの1vs1ゲーム WebRTCの活用
ponyo877
0
380
Featured
See All Featured
Practical Orchestrator
shlominoach
185
10k
Learning to Love Humans: Emotional Interface Design
aarron
270
40k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
28
1.6k
Teambox: Starting and Learning
jrom
131
8.7k
It's Worth the Effort
3n
182
27k
What’s in a name? Adding method to the madness
productmarketing
PRO
21
3k
Designing for humans not robots
tammielis
248
25k
Atom: Resistance is Futile
akmur
261
25k
Faster Mobile Websites
deanohume
304
30k
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
28
8.9k
Designing with Data
zakiwarfel
98
5k
Building an army of robots
kneath
302
42k
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