Skip to content

Commit 05a489e

Browse files
author
狄卢
committed
chang to more clearly sentence
1 parent 540e8ec commit 05a489e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/03-git-branching/sections/rebasing.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ You can take the changes on client that aren't on server (`C8` and `C9`) and rep
7979
$ git rebase --onto master server client
8080
----
8181

82-
This basically says, ``Check out the client branch, figure out the patches from the common ancestor of the `client` and `server` branches, and then replay them onto `master`.''
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.''
8383
It's a bit complex, but the result is pretty cool.
8484

8585
.Rebasing a topic branch off another topic branch

0 commit comments

Comments
 (0)