Skip to content

Commit

Permalink
Fixing an error in the description of a command
Browse files Browse the repository at this point in the history
  • Loading branch information
pawelkrupinski authored Jan 26, 2017
1 parent 66d2711 commit 4165956
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion book/03-git-branching/sections/rebasing.asc
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ You can take the changes on client that aren't on server (`C8` and `C9`) and rep
$ git rebase --onto master server client
----

This basically says, ``Take the `client` branch, figure out the patches since it diverged from the `master` branch, and replay these patches in the `client` branch as if it was based directly off the `master` branch instead.''
This basically says, ``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.''
It's a bit complex, but the result is pretty cool.

.Rebasing a topic branch off another topic branch
Expand Down

0 comments on commit 4165956

Please sign in to comment.