You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: book/03-git-branching/sections/rebasing.asc
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -79,7 +79,7 @@ You can take the changes on client that aren't on server (`C8` and `C9`) and rep
79
79
$ git rebase --onto master server client
80
80
----
81
81
82
-
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.''
82
+
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.''
83
83
It's a bit complex, but the result is pretty cool.
0 commit comments