Skip to content

Fixing an error in the description of a command #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2017
Merged

Fixing an error in the description of a command #714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/03-git-branching/sections/rebasing.asc
View file
Open in desktop
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