~/talk

Git your PR accepted. Rebase your changes like a pro

Talkat RailsConf 2022 · 2022-05-17..05-19· [developer-experience]
links:none on file
slides:none on file

Sees a concrete promise: take a branch with 30+ messy commits and turn it into a readable narrative so a PR actually gets merged. Shows commands and tactics: git rebase -i to reorder, squash/fixup/drop/edit to combine or remove work, git commit --amend and git reset --hard during edits, and git reflog plus git rebase --abort to recover. Demonstrates splitting, moving code between commits, and the push/force workflow; months of trial commits collapse into a pristine, reviewable history that gets accepted.

AI-written summary · about

  1. 0:00Start
  2. 7:39Git Internals - References
  3. 9:45Git Internals - Branch and Merge
  4. 10:58Git Internals - Rebase
  5. 12:28git rebase-interactive
  6. 14:28git rebase --interactive
  7. 16:45Rebase Commands
  8. 24:22Recovering from disaster
  9. 29:04Read this book!
~/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.