~/talk

Getting out of trouble by understanding Git

Talkat Codemotion Milan 2016 · 2016-11-23..11-26· [developer-experience]
slides:none on file

Explains Git as three concrete objects—blob, tree, commit—and shows how refs (branches/tags) point to hashes, why SHA-1 collisions are theoretical, and how pack files and GC compress objects. Demonstrates practical rescues: using reflog recovery after a mistaken git reset, undoing a broken rebase with git reset or rebase --exec running tests, and finding the regression commit with git bisect. Also covers git cat-file, git hash-object, fast‑forward vs --no-ff merges, and hidden objects.

AI-written summary · about

  1. 0:00Introduction to Git troubles
  2. 3:15Git’s core data structures
  3. 11:06Understanding refs branches and tags
  4. 16:10Resets and garbage collection
  5. 23:00Merging and fast-forwarding
  6. 28:28Rebasing history cleanly
  7. 30:39Getting out of trouble with Git
  8. 37:48Conceptual model of Git
~/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.