Skip to content

Commit af9af41

Browse files
committed
Remove monospace formatting
1 parent 4155793 commit af9af41

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
@@ -202,7 +202,7 @@ So instead of the result we see in <<_merge_rebase_work>>, we would end up with
202202
image::images/perils-of-rebasing-5.png[Rebase on top of force-pushed rebase work.]
203203

204204
This only works if `C4` and `C4'` that your partner made are almost exactly the same patch.
205-
Otherwise the `rebase` won't be able to tell that it's a duplicate and will add another C4-like patch (which will probably fail to apply cleanly, since the changes would already be at least somewhat there).
205+
Otherwise the rebase won't be able to tell that it's a duplicate and will add another C4-like patch (which will probably fail to apply cleanly, since the changes would already be at least somewhat there).
206206

207207
You can also simplify this by running a `git pull --rebase` instead of a normal `git pull`.
208208
Or you could do it manually with a `git fetch` followed by a `git rebase teamone/master` in this case.

0 commit comments

Comments
 (0)