~/talk

Advanced Git Magic

Talkat Full Stack Europe 2022 · 2022-10-05..10-07· [developer-experience]
slides:none on file

Covers concrete workflows: enforce atomic commits, use interactive rebase (git rebase -i HEAD~N, stash, edit, git rebase --continue) to reshape history; time travel with checkout HEAD~5 and handle a detached HEAD by creating a branch; recover dropped commits via git reflog and git reset --hard <ref>; run automated root-cause searches with git bisect (git bisect start/good/bad and git bisect run <script>), feeding a file-existence or unit test script; demoed on a tiny trogdor CLI, found the bad commit, fixed it, and squashed fix+regression into one commit.

AI-written summary · about

  1. 0:00Introduction
  2. 1:35The sequel to get legit
  3. 2:38Atomic commits
  4. 5:01Interactive rebase
  5. 8:56Git time travel
  6. 12:39Using reflog
  7. 19:36Introduction to bisect
  8. 24:07Automating bisect
  9. 29:04Bug hunting workflow
  10. 37:22Finalizing the fix
~/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.