~/talk

Git Beyond Push & Pull

Talkat NDC Oslo 2024 · 2024-06-10..06-14· [developer-experience]
links:none on file
slides:none on file

Covers concrete workflows: use git add -p to stage hunks and produce focused commits, undo with git reset or checkout-patch, and tidy history with interactive rebase and git rebase --autosquash (squash, fixup, edit). Demonstrates cherry-pick and format-patch, runs tests per-commit via rebase -x, and automates a binary search with git bisect on GCC to narrow a regression from millions of lines changed to about 50 commits, locating a spurious return and confirming the fix.

AI-written summary · about

  1. 0:00Introduction to Git show-and-tell
  2. 2:08Philosophy of commit messages
  3. 4:23Formatting and conventions
  4. 7:19Contextual commit messages
  5. 12:01Adding depth to messages
  6. 15:45Commit resolution and focus
  7. 18:51History mutability and strategy
  8. 22:17Mastering the Git stage
  9. 30:46Refining history with reset
  10. 35:34Advanced rebasing techniques
  11. 39:27Automating history verification
  12. 47:15Debugging with binary search
  13. 53:56Advanced searching and conclusion
~/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.