~/talk

Git Hidden Gems

Talkat NDC Oslo 2023 · 2023-05-22..05-26· [developer-experience]
links:none on file
slides:none on file

Nine concrete Git tricks are demonstrated, including a custom git log format that shows abbreviated hashes and refs, using Delta as core.pager for syntax-highlighted diffs, selective staging with git add -p and git restore hunks, stash --keep-index to test staged-only changes, pickaxe (-S) and -L for function-level history searches, automated workflows with rebase --autosquash and auto-stash, reflog for undoing rebases, and rerere to record and replay conflict resolutions.

AI-written summary · about

  1. 0:00Introduction and setup
  2. 4:08Pretty logs and aliases
  3. 8:15Pretty diffs with Delta
  4. 10:22Partial staging and patching
  5. 16:43Stashing changes
  6. 18:53Advanced search capabilities
  7. 22:17Automation with auto squash
  8. 28:48Dot notation for comparisons
  9. 33:23Rebase onto functionality
  10. 38:25Using the reflog
  11. 45:44Rerere for conflict resolution
~/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.