Skip to content

Commit e6d12fa

Browse files
committed
更新 git操作文档
1 parent 1013899 commit e6d12fa

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

Tutorial/SourceControl/git.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,16 @@ HBuilderX 3.1.23+ 支持在项目管理上对Git项目进行一些快捷操作
3636

3737
<img src="/static/snapshots/gitextension_pull.png" style="border:1px solid #eee; border-radius: 5px;"/>
3838

39+
```
40+
# git pull和git pull --rebase的区别
41+
git pull = git fetch + git merge
42+
git pull --rebase = git fetch + git rebase
43+
```
44+
3945
### 推送(push)
4046

4147
点击“推送”菜单,默认提供了几个推送选项(目前不能自定义),当选择“force”选项是,会进行二次确认是否继续执行:
4248

43-
<img src="/static/snapshots/gitextension_push.png" style="border:1px solid #eee; border-radius: 5px;"/>
49+
<img src="/static/snapshots/gitextension_push.png" style="border:1px solid #eee; border-radius: 5px;"/>
50+
51+
特别说明: `git push --force` 强制推送,会覆盖远端内容,请谨慎操作。

0 commit comments

Comments
 (0)