~/talk

Simplify Your Code Reviews with Interactive Rebase

TalkinFrenchat Devoxx France 2022 · 2022-04-20..04-22· [developer-experience]
links:none on file
slides:none on file

Shows how to clean up a messy Git feature branch into a clear, logical commit history using interactive rebase (git rebase -i). Covers using reword, edit, fixup/squash to rename commits, split a WIP commit into separate changes (database query, model, route), reorder commits, and merge fixup patches while preserving useful messages; also gives safety advice (don’t rewrite branches others use, prefer force-with-lease, and use git rebase --abort to recover from conflicts).

AI-written summary · about

  1. 0:00Introduction
  2. 0:51A sometimes laborious task
  3. 1:32Leveraging the MR
  4. 3:37Scenario
  5. 4:22Expectations
  6. 4:33Reality
  7. 5:13Introduction to interactive rebase
  8. 6:00Reword
  9. 6:40Edit
  10. 9:34Squash vs Fixup
  11. 10:11Remarks
~/search
type to search 6,249 conferences, 138,987 speakers and 185,172 talks
~/help
cmdctrl k
search every conference, speaker and series
/
focus the filter search
h
home
c
conferences
s
speakers
e
series
t
light / dark — the status bar button does the same
?
this help
esc
close this, then clear every filter — or just the search, while you are typing in it

Ignored while you are typing. Pages without a filter rail have no search to focus.