~/talk

Git, rewrite the history

TalkinFrenchat DevOps D-Day 2022 · on Thursday, 2022-12-01· [developer-experience]
name:A. Céol
links:none on file
slides:none on file

A live Git surgery demo showing how to rewrite history using git commit --amend, git reflog and git reset to roll back commits, creating a branch with git switch -c, and performing an interactive rebase (git rebase -i) with --autosquash plus fixup/squash. The demo includes an Exec step that runs tests (which can stop the rebase on failure so fixes are made), recovers lost commits from the reflog across about 18 commits, and demonstrates safe sharing with git push --force-with-lease and using git revert for public history.

AI-written summary · about

  1. 0:00Git history rewrite intro
  2. 3:33Git walkthrough prep
  3. 5:22Fix commit with amend
  4. 7:11Navigate with reflog
  5. 8:15Go back with reset
  6. 9:23New branch with switch
  7. 10:51Rebase a branch
  8. 15:28Interactive rebase
  9. 26:57Risks and best practices
  10. 31:11Clean history benefits
  11. 35:04Git for Open Source teams
  12. 36:50Tips and useful tools
  13. 39:44Conclusion
~/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.