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
chibiccをCILに移植した結果 (NGK2025S版)
kekyo
PRO
0
210
Spring gRPC について / About Spring gRPC
mackey0225
0
220
いりゃあせ、PHPカンファレンス名古屋2025 / Welcome to PHP Conference Nagoya 2025
ttskch
1
270
Formの複雑さに立ち向かう
bmthd
1
720
社内フレームワークとその依存性解決 / in-house framework and its dependency management
vvakame
1
550
昭和の職場からアジャイルの世界へ
kumagoro95
1
350
Honoをフロントエンドで使う 3つのやり方
yusukebe
4
2.1k
動作確認やテストで漏れがちな観点3選
starfish719
6
1k
ASP. NET CoreにおけるWebAPIの最新情報
tomokusaba
0
360
Amazon Q Developer Proで効率化するAPI開発入門
seike460
PRO
0
110
AIの力でお手軽Chrome拡張機能作り
taiseiue
0
170
Featured
See All Featured
Designing for humans not robots
tammielis
250
25k
Stop Working from a Prison Cell
hatefulcrawdad
267
20k
Code Review Best Practice
trishagee
66
17k
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
193
16k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
280
13k
Fantastic passwords and where to find them - at NoRuKo
philnash
51
3k
Optimising Largest Contentful Paint
csswizardry
34
3.1k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
33
2.1k
The Pragmatic Product Professional
lauravandoore
32
6.4k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
33
2.8k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
160
15k
Designing Experiences People Love
moore
139
23k
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