diff --git a/book/03-git-branching/sections/rebasing.asc b/book/03-git-branching/sections/rebasing.asc index c66535246..d8a2d79a3 100644 --- a/book/03-git-branching/sections/rebasing.asc +++ b/book/03-git-branching/sections/rebasing.asc @@ -23,7 +23,7 @@ However, there is another way: you can take the patch of the change that was int In Git, this is called _rebasing_. With the `rebase` command, you can take all the changes that were committed on one branch and replay them on a different branch.(((git commands, rebase))) -For this example, you would check out the `experiment` branch, and then rebase it onto the `master` branch as follows: +For this example, you would check out the `experiment` branch, and then rebase the `master` branch HEAD onto the `experiment` branch as follows: [source,console] ---- diff --git a/images/basic-rebase-3.png b/images/basic-rebase-3.png index 846aebccb..7b2a8d4af 100644 Binary files a/images/basic-rebase-3.png and b/images/basic-rebase-3.png differ diff --git a/images/basic-rebase-3.svg b/images/basic-rebase-3.svg index 9bb11f9ab..7ac7eb6a7 100644 --- a/images/basic-rebase-3.svg +++ b/images/basic-rebase-3.svg @@ -1,64 +1,264 @@ - - - - - - image/svg+xml - - images/basic-rebase-3 - - - - - images/basic-rebase-3 - Created with Sketch. - - - - - - C0 + + + + + + + + image/svg+xml + + images/basic-rebase-3 + + + + + images/basic-rebase-3 + Created with Sketch. + + + + + + C0 + + + + C1 + + + + C2 + + + + + experiment + + + + + + C4 + + + + + + + C3 + + + + + + C4' + + + + + + master + + - - - C1 - - - - C2 - - - - - - experiment - - - - - - - C4 - - - - - - - C3 - - - - - - C4' - - - - - - master - - -