~/talk

Git Happens or How to fix common git mistakes

Talkat DevOps fwdays'23 · 2023-03-16..03-21· [developer-experience]
links:none on file
slides:none on file

Shows concrete fixes with a live repo: undo unstaged edits with git checkout -- <file>, combine staged changes into the previous commit with git commit --amend, rewrite older commits with git rebase -i to drop or squash a bad change, and recover after a disastrous git reset --hard using git reflog plus git cherry-pick. Demos modify a small counter file, intentionally add a stray cat image, and then successfully remove or restore commits so history and remote state end up clean.

AI-written summary · about

  1. 0:00Introduction
  2. 0:33My development experience
  3. 1:51What is Git
  4. 2:53Benefits of Git
  5. 6:11Undo local changes
  6. 8:54Git commit amend
  7. 12:42Git rebase
  8. 18:03Git reset
  9. 22:15Git reflog
~/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.