~/talk

Understanding git - even the scary parts

Talkat Laracon AU 2018 · 2018-10-18..10-19· [developer-experience]
slides:none on file

Explains actual git internals: blobs trees commits as storage, how branches are just refs, and why rebasing rewrites commit objects so hashes change. Demonstrates working commands (init, checkout, merge, rebase, log --graph), resolves conflicts live, and compares merge commit vs linear history. Emphasizes recovery tools like reflog and git rerere, recommends experimenting on throwaway branches, avoiding force-push on shared branches, and shows concrete failure-and-restore steps so the comfort comes from reproducible procedures.

AI-written summary · about

  1. 0:00Start
  2. 3:42Commit Logs From Last Night
  3. 7:47Commit object Contains commit metadata • Points to corresponding tree object • Also points to any parent commit(s)
  4. 11:56Let's try rebasing this time git rebase master
~/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.