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