Skip to content

Commit 352279e

Browse files
committed
Merge pull request #115 from dualsky/master
Synchronize image caption with the image content
2 parents 656aec6 + 58f0dc4 commit 352279e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Applying: added staged command
3434

3535
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.
3636

37-
.Rebasing the change introduced in `C3` onto `C4`
38-
image::images/basic-rebase-3.png[Rebasing the change introduced in `C3` onto `C4`.]
37+
.Rebasing the change introduced in `C4` onto `C3`
38+
image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`.]
3939

4040
At this point, you can go back to the master branch and do a fast-forward merge.
4141

0 commit comments

Comments
 (0)