~/talk

Story telling with Git rebase

Talkat RubyConf 2019 · 2019-11-18..11-20· [devops-and-delivery]
slides:none on file

Shows how to use Git to revise history before sharing and leave a readable narrative Git log Demonstrates interactive rebasing to edit reorder squash and drop commits with concrete commands like git rebase -i and conflict resolution steps Uses git add -p to stage hunks and git commit --fixup plus --autosquash to collapse work into one to four tidy commits Advises force pushing only feature branches and merging into master with fast forward only so the linear history actually works

AI-written summary · about

  1. 0:00Start
  2. 0:21Complexity
  3. 0:33Communicate
  4. 0:57Version Control System
  5. 7:27Encapsulation
  6. 7:49Pull requests and code reviews
  7. 11:37Rebasing
  8. 34:02Work in small thematic feature branches
~/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.