From 41659568558edc17f6e280d888dc6dd11665b177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Krupi=C5=84ski?= Date: Thu, 26 Jan 2017 14:59:11 +0000 Subject: [PATCH] Fixing an error in the description of a command --- book/03-git-branching/sections/rebasing.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/03-git-branching/sections/rebasing.asc b/book/03-git-branching/sections/rebasing.asc index cf1e0bb90..63c1e68ab 100644 --- a/book/03-git-branching/sections/rebasing.asc +++ b/book/03-git-branching/sections/rebasing.asc @@ -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