Now $git show-branch master server client shows like this:
<-- commit0 <-- commit1 <-- commit2 master
\
\-- commit3 <-- commit4 server
\
\-- commit5 <-- commit6 clientWhat does $ git rebase --onto master server client do?
- Checkout client branch
- Figure out the patches from the common ancestor of server and client (commits of
git log server..client) - Replay the patches onto master
Run $git show-branch master server client again:
master client
| |
<-- commit0 <-- commit1 <-- commit2 <-- commit5 <-- commit6
\
\-- commit3 <-- commit4
|
server