repos/notes
1
Fork 0
mirror of https://github.com/RealOrangeOne/notes.git synced 2024-12-22 08:35:59 +00:00
Code Activity

Add note about rebasing

Browse source
This commit is contained in:
Jake Howard 2020-10-07 18:03:05 +01:00
parent b9cac95249
commit 5f6546f775
Signed by: jake
GPG key ID: 57AFB45680EDD477
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
notes/git/rebase-onto.md Normal file
View file

@ -0,0 +1,12 @@
---
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.