~/talk

Keynote: Wrapping Your Head Around Git

Talkat Garden City Ruby 2015 · on Saturday, 2015-01-10· [developer-experience]
slides:none on file

Claim: understanding the .git directory and object model makes rebases, merges and remote problems simple. Demonstration uses git commands (git init, git hash-object, git cat-file, git add/commit, git checkout, merge, rebase, fetch/pull/push) to show a repository as a persistent hash map of SHA-1 hashes (blobs, trees, commits, tags), how branches are just files under refs and how HEAD points to the current ref. Five objects appear after the first commit; collisions are essentially impossible; cloning copies the object DB and fetch/push transfer only missing objects.

AI-written summary · about

  1. 0:00Git as a content tracker
  2. 1:01Hashing content with Git
  3. 2:53Hash collision probability
  4. 5:48Persistent object storage
  5. 9:05Trees and Git internals
  6. 13:04Git as a file system
  7. 16:38Commits and history
  8. 20:31References and branches
  9. 23:57Branching and merging
  10. 28:40Fast-forward merges
  11. 30:15Rebasing mechanics
  12. 32:46Garbage collection
  13. 33:47Remote repositories
  14. 35:34Fetching and pushing
  15. 37:02Git distribution model
  16. 37:36Fluent Git usage
~/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.