~/talk

You Don’t Know Git

Talkat NDC London 2025 · 2025-01-27..01-31· [devops-and-delivery]
slides:none on file

Covers concrete git hacks: global aliases for compact git lol and git graph, color tweaks (256/hex when terminal supports), faster repo searches with git grep (pattern.type=perl, grep.lineNumber), using reflog with --date=iso and pretty, recovering uncommitted blobs with git recover (external tool), word-level diffs (git diff --word-diff), git blame -C -C -C, merge.conflictstyle=diff3 and GUI merge tools, rerere enabled, core.excludesfile and conditional includes, plus .gitattributes star text=auto for safe line endings.

AI-written summary · about

  1. 0:00Introduction
  2. 1:47Customizing Git
  3. 5:30Git aliases
  4. 10:59Terminal colors
  5. 12:11Finding code
  6. 19:31Git reflog
  7. 26:08Recovering changes
  8. 30:12Git diff
  9. 34:39Git blame
  10. 37:25Merging and conflicts
  11. 45:53Rerere
  12. 51:20Gitignore and config
  13. 55:40Line endings
~/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.