From 58f0dc43451caa0746930d21d72e61ee55789a18 Mon Sep 17 00:00:00 2001 From: dualsky <0h@wp.pl> Date: Mon, 27 Oct 2014 07:59:13 +0100 Subject: [PATCH] Synchronize image caption with the image content --- book/03-git-branching/sections/rebasing.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/03-git-branching/sections/rebasing.asc b/book/03-git-branching/sections/rebasing.asc index d8cf7b29a..b65709077 100644 --- a/book/03-git-branching/sections/rebasing.asc +++ b/book/03-git-branching/sections/rebasing.asc @@ -34,8 +34,8 @@ Applying: added staged command It works by going to the common ancestor of the two branches (the one you're on and the one you're rebasing onto), getting the diff introduced by each commit of the branch you're on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn. -.Rebasing the change introduced in `C3` onto `C4` -image::images/basic-rebase-3.png[Rebasing the change introduced in `C3` onto `C4`.] +.Rebasing the change introduced in `C4` onto `C3` +image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`.] At this point, you can go back to the master branch and do a fast-forward merge.