mirror of
https://github.com/RealOrangeOne/notes.git
synced 2024-11-17 00:19:02 +00:00
408 B
408 B
title | tags | link | |
---|---|---|---|
Rebase commits done on the wrong branch |
|
https://git-scm.com/book/en/v2/Git-Branching-Rebasing#_more_interesting_rebases |
git rebase --onto master server client
Take the
client
branch, figure out the patches since it diverged from theserver
branch, and replay these patches in the client branch as if it was based directly off themaster
branch instead.