修正 rebase 方法.

Signed-off-by: rick.chan <chenyang@autoai.com>
This commit is contained in:
rick.chan 2020-08-14 15:08:46 +08:00
parent 47ae30555a
commit a9806e45bd
1 changed files with 5 additions and 1 deletions

View File

@ -324,7 +324,11 @@ git rebase [-i] [upstream]
通过增加 -i 参数可进入交互模式。使用 Rebase 还可以将多次提交进行合并,或设置起止点。
```bash
git rebase [-i] [start commit id] [end commit id]
git rebase [-i] <start commit id> <end commit id>
# 合并最后 n 次提交
git rebase [-i] HEAD~<n>
# 合并某个 commit id 以来的提交
git rebase [-i] <to commit id>
```
如果发生了冲突,可以在解决冲突并 add 后,通过: