~/talk

Let's "git" it right !

Talkat BlaBlaConf 2025 · 2025-02-03..02-07· [developer-experience]
slides:none on file

Live demo shows how to recover and reshape history: initialize a repo, use git add and git commit, then demonstrate git reset --soft versus git reset --hard (soft preserves staged edits, hard removes them), use git rm to delete from index and working tree, use git switch - to jump back to the previous branch, inspect history with git log and git reflog, and run git rebase -i to edit, reorder, squash and reword commits so feature edits group cleanly.

AI-written summary · about

  1. 0:00Introduction
  2. 1:53Basic Git commands
  3. 5:58Soft vs hard reset
  4. 10:04Branching and switching
  5. 14:11Viewing commit history
  6. 17:29Advanced Git workflows
  7. 22:42Fixing merge conflicts
  8. 24:41Rebasing vs resetting
  9. 26:55Cleaning up history
  10. 27:42Q&A and closing
~/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.