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
100
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
68
Shipping containers
alextercete
0
56
Parallelism and Symmetry
alextercete
0
220
Porting to .NET Standard
alextercete
0
58
Prepping Commits
alextercete
1
130
The end of your line-endings nightmare
alextercete
0
190
ReadyRoll for DotNet developers
alextercete
0
89
Coding Dojo: The Randori Kata
alextercete
1
520
How to be a good pair [programmer]
alextercete
0
130
Other Decks in Programming
See All in Programming
Windows版PHPのビルド手順とPHP 8.4における変更点
matsuo_atsushi
0
370
海外のアプリで見かけたかっこいいTransitionを真似てみる
shogotakasaki
1
110
マルチアカウント環境での、そこまでがんばらない RI/SP 運用設計
wa6sn
0
620
エンジニア未経験が最短で戦力になるためのTips
gokana
0
220
OpenTelemetryを活用したObservability入門 / Introduction to Observability with OpenTelemetry
seike460
PRO
1
350
私の愛したLaravel 〜レールを超えたその先へ〜
kentaroutakeda
12
3.6k
2025/3/18 サービスの成長で生じる幅広いパフォーマンスの問題を、 AIで手軽に解決する
shirahama_x
0
160
AIエージェントを活用したアプリ開発手法の模索
kumamotone
1
760
CTFのWebにおける⾼難易度問題について
hamayanhamayan
1
1k
リアルタイムレイトレーシング + ニューラルレンダリング簡単紹介 / Real-Time Ray Tracing & Neural Rendering: A Quick Introduction (2025)
shocker_0x15
1
130
今から始めるCursor / Windsurf / Cline
kengo_hayano
0
110
AtCoder Heuristic First-step Vol.1 講義スライド
terryu16
2
1k
Featured
See All Featured
The Web Performance Landscape in 2024 [PerfNow 2024]
tammyeverts
4
500
The World Runs on Bad Software
bkeepers
PRO
67
11k
Rails Girls Zürich Keynote
gr2m
94
13k
Faster Mobile Websites
deanohume
306
31k
Documentation Writing (for coders)
carmenintech
69
4.7k
Keith and Marios Guide to Fast Websites
keithpitt
411
22k
Navigating Team Friction
lara
184
15k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
12
1.4k
GraphQLとの向き合い方2022年版
quramy
45
14k
Java REST API Framework Comparison - PWX 2021
mraible
29
8.5k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
40
2k
Performance Is Good for Brains [We Love Speed 2024]
tammyeverts
8
700
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