~/talk

Git stories from the front line

links:none on file
slides:none on file

Practical, example-rich run through of useful Git shortcuts and workflows: defines aliases like st, co and fixup, shows stash alternatives whip/save/wipe that commit WIP and can be pushed, demonstrates merging with --no-ff versus rebasing branches onto master to keep commits linear, uses git reflog plus git reset --hard to rewind, enables git rerere to remember conflict resolutions, and points to a script (Salvatori) that lists commits present on one branch but not another and a dotfiles repo with the full alias set.

AI-written summary · about

  1. 0:00Introduction to Git workflows
  2. 1:45Best practices in Git usage
  3. 6:36Why use Git aliases
  4. 15:18Whip and save Git shortcuts
  5. 25:27Git rebase explained and demo
  6. 34:00Reflog and conflict resolution
  7. 40:02Automate repetitive Git tasks
~/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.