Skip to content

Commit 09b8cd0

Browse files
razonyangnetworm
authored andcommitted
Update rebasing.asc
1 parent 005c5b0 commit 09b8cd0

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,6 @@ image::images/perils-of-rebasing-5.png[在一个被变基然后强制推送的
214214

215215
在本例中另一种简单的方法是使用 `git pull --rebase` 命令而不是直接 `git pull`。
216216
又或者你可以自己手动完成这个过程,先 `git fetch`,再 `git rebase teamone/master`。
217-
You can also simplify this by running a `git pull --rebase` instead of a normal `git pull`.
218-
Or you could do it manually with a `git fetch` followed by a `git rebase teamone/master` in this case.
219217

220218
如果你习惯使用 `git pull` ,同时又希望默认使用选项 `--rebase`,你可以执行这条语句 `git config --global pull.rebase true` 来更改 `pull.rebase` 的默认配置。
221219

0 commit comments

Comments
 (0)