~/talk

Git Dammit!

TalkinFrenchat DevFest Nantes 2018 · 2018-10-18..10-19· [developer-experience]
slides:none on file

Shows concrete Git techniques for cleaning commit history and addressing review feedback: use git commit --fixup with git rebase -i --autosquash to fold fixes into original commits, use git reset (--soft|--mixed|--hard) to remove recent commits, and force-push after rewriting. Demonstrates practical workflows on a three-person team and a small demo (animated “cars in the sky”), including git add -p to split hunks, git cherry-pick -n to import work, and examples of rebase vs pull causing unexpected conflicts.

AI-written summary · about

  1. 0:00Start
  2. 10:27Two Steps
  3. 34:52A Few Tricks to Take Away...
  4. 40:47I Want to Undo Changes Made to a Specific File
~/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.