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
I love sushi, therefore I love rebase
Search
Alex Tercete
November 29, 2016
Programming
0
99
I love sushi, therefore I love rebase
Give sushi and rebase a second chance!
Alex Tercete
November 29, 2016
Tweet
Share
More Decks by Alex Tercete
See All by Alex Tercete
Making Makefiles
alextercete
0
64
Shipping containers
alextercete
0
52
Parallelism and Symmetry
alextercete
0
200
Porting to .NET Standard
alextercete
0
53
Prepping Commits
alextercete
1
120
The end of your line-endings nightmare
alextercete
0
170
ReadyRoll for DotNet developers
alextercete
0
84
Coding Dojo: The Randori Kata
alextercete
1
470
How to be a good pair [programmer]
alextercete
0
120
Other Decks in Programming
See All in Programming
Streams APIとTCPフロー制御 / Web Streams API and TCP flow control
tasshi
2
350
.NET のための通信フレームワーク MagicOnion 入門 / Introduction to MagicOnion
mayuki
1
1.6k
Jakarta EE meets AI
ivargrimstad
0
560
色々なIaCツールを実際に触って比較してみる
iriikeita
0
330
CSC509 Lecture 13
javiergs
PRO
0
110
cmp.Or に感動した
otakakot
3
180
Amazon Bedrock Agentsを用いてアプリ開発してみた!
har1101
0
340
CSC509 Lecture 11
javiergs
PRO
0
180
OSSで起業してもうすぐ10年 / Open Source Conference 2024 Shimane
furukawayasuto
0
100
RubyLSPのマルチバイト文字対応
notfounds
0
120
受け取る人から提供する人になるということ
little_rubyist
0
230
とにかくAWS GameDay!AWSは世界の共通言語! / Anyway, AWS GameDay! AWS is the world's lingua franca!
seike460
PRO
1
880
Featured
See All Featured
Visualization
eitanlees
145
15k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
38
1.8k
Fashionably flexible responsive web design (full day workshop)
malarkey
405
65k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
27
840
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
25
1.8k
Ruby is Unlike a Banana
tanoku
97
11k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
232
17k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
kevinliebholz
27
4.3k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
169
50k
Code Review Best Practice
trishagee
64
17k
Statistics for Hackers
jakevdp
796
220k
A better future with KSS
kneath
238
17k
Transcript
Alex Tercete @alextercete I ❤ SUSHI therefore I ❤ REBASE
None
Nourishment & Delight
Nourishment & Delight food
Nourishment & Delight food changes
Nourishment & Delight food changes Survival Satisfaction
Nourishment & Delight food changes Survival Satisfaction
Who here likes sushi?
+
None
None
None
you
you remote
you teammate remote
you teammate remote
$ git push --force-with-lease
you teammate remote
you teammate remote
you teammate remote
you teammate remote
$ git fetch $ git reset --hard … $ git
cherry-pick …
I ❤ SUSHI therefore I ❤ REBASE
None
Release version 1.2.3 Merge pull request #45 from ... Introduce
parser abstraction Extract name parsing logic Remove trailing whitespace README: Add setup instructions Add .editorconfig
$ git add --interactive
None
None
None
None
None
$ git rebase --interactive
None
None
None
None
None
None
None
$ git add --patch $ git diff --check
None
None
None
Alex Tercete @alextercete Thanks!
Credits ePi.Longo flickr.com/photos/longo/2176603327 Mathieu Schoutteten flickr.com/photos/mathieu_schoutteten/6776577405 Yoel Ben-Avraham flickr.com/photos/epublicist/15552378181 Shaun
Fisher flickr.com/photos/87007001@N04/14643379354 James Bowe flickr.com/photos/jamesrbowe/4231509266 slimmer_jimmer flickr.com/photos/slimjim/2338297312 Yuri Samoilov flickr.com/photos/yuri_samoilov/10590523726 Michael Saechang flickr.com/photos/saechang/15588474204