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
Gitting like a Pro
Search
Stratos Pavlakis
June 13, 2017
Technology
290
1
Share
Gitting like a Pro
Git recipes for healthier coding
Stratos Pavlakis
June 13, 2017
More Decks by Stratos Pavlakis
See All by Stratos Pavlakis
Intro to Remix
pavlakis
0
180
Gitting like a pro - Take 2.pdf
pavlakis
0
72
4th Virtual GreeceJS - Tech News
pavlakis
0
36
3rd Virtual GreeceJS - Tech News
pavlakis
0
49
PWAs: the Application Shell & the well of surprises
pavlakis
1
220
Error Handling in Javascript
pavlakis
1
220
Async Patterns & Paradigms in Javascript
pavlakis
4
330
Introduction to FRP
pavlakis
3
250
Going Mobile
pavlakis
2
220
Other Decks in Technology
See All in Technology
Unlocking the Apps
pimterry
0
130
オンコールの負荷軽減のためのBits Assistant 活用方法 / How to Use Bits Assistant to Reduce the Workload on On-Call Staff
sms_tech
1
350
AI Adaptable なテストを整える工夫 / Ways to Make Your Tests AI-Adaptable
bitkey
PRO
2
190
Platform Engineering as a Product: Criteria for Improvement and Multi-Tenant Design
kumorn5s
0
420
React、まだ楽しくて草
uhyo
7
1.9k
AI時代から振り返るTerraform drift運用の歴史 / AI Age Reflections on the History of Terraform Drift Operations
aeonpeople
1
620
ITエンジニアを取り巻く環境とキャリアパス / A career path for Japanese IT engineers
takatama
4
1.8k
long-running-tasks
cipepser
2
450
管理アカウント単一運用からAWS Organizationsに移行するの大変で滅
hiramax
0
340
Oracle AI Database@AWS:サービス概要のご紹介
oracle4engineer
PRO
4
2.7k
Datadog 認定試験の概要と対策
uechishingo
0
210
ポスター発表&デモと総括 / Poster Presentations & Demonstrations and Summary
ks91
PRO
0
180
Featured
See All Featured
Into the Great Unknown - MozCon
thekraken
41
2.5k
Java REST API Framework Comparison - PWX 2021
mraible
34
9.3k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
9
1.4k
Design of three-dimensional binary manipulators for pick-and-place task avoiding obstacles (IECON2024)
konakalab
0
440
Introduction to Domain-Driven Design and Collaborative software design
baasie
1
810
Marketing to machines
jonoalderson
1
5.3k
So, you think you're a good person
axbom
PRO
2
2k
Neural Spatial Audio Processing for Sound Field Analysis and Control
skoyamalab
0
310
Leadership Guide Workshop - DevTernity 2021
reverentgeek
1
290
A brief & incomplete history of UX Design for the World Wide Web: 1989–2019
jct
2
380
Optimizing for Happiness
mojombo
378
71k
Why Our Code Smells
bkeepers
PRO
340
58k
Transcript
GITTING LIKE A PRO git recipes for healthier coding
Stratos Pavlakis UI Tech Lead @ Workable https://github.com/th3hunt https://twitter.com/th3hunt who
is this guy?
Developers agreeing on Git work ow Jacques-Louis David, 1796-1799 Oil
on Canvas
No need for such drama - Git knowledgeable developer
Git Anatomy
$ ls -F1 .git HEAD config description hooks/ info/ objects/
refs/
Now the secret to make the most out of a
tool is ...
to make it accessible!
con guration
# do some less typing git config --global alias.co checkout
git config --global alias.st status # shell out if needed la=!git config -l | grep alias | cut -c 7- # style your output log --graph \ --pretty=format':%C(yellow)%h%C(auto)%d%Creset %Creset%s %C(242)<%an>%Creset'
Git Recipes
KEEP A READABLE HISTORY REBASE don't merge Fixup Autosquash
Programmer nds 1395 con icts after ‘git rebase develop’ 3
days before the deadline Gustav Courbet, 1844–1845 Oil paint
ESCAPE GROUNDHOG DAY AND KEEP YOUR SANITY git rerere WTF
dude? no really... git rerere
FIND THE NEEDLE IN THE HAYSTACK bisect bisect on autopilot
JUMP BETWEEN BRANCHES LIKE A PRO git worktree add
REVERT A BRANCH Find the mainline parent (X) git cat-
le -p <merge-commit> Revert the merge commit git revert -m X <merge-commit>
HARDCORE MAGIC lter_branch replace
Thank you! Questions?