~/talk

Git Hidden Gems

links:none on file
slides:none on file

Nine concrete Git tricks demonstrated with live commands and successful demos: nine gems include using Delta pager (Rust) for colored diffs, creating a reusable git add -p workflow to stage hunks, isolating staged changes with git stash --keep-index, searching history with git log -S (pickaxe), enabling rebase.autosquash and rebase.autoStash to automate squashing, performing branch surgery with git rebase --onto, recovering lost commits via git reflog, and recording/auto-applying conflict resolutions with git rerere.

AI-written summary · about

  1. 0:00Introduction
  2. 4:06Pretty logs and aliases
  3. 8:57Enhancing diff output
  4. 11:30Staging and partial commits
  5. 17:43Verification with stash
  6. 19:50Searching history
  7. 23:40Rebase automation
  8. 31:28Comparing branches
  9. 36:42Advanced rebasing
  10. 41:28Utilizing the reflog
  11. 51:45Conflict 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.