From 47ae30555a1768f3f661f7d4994879c6121bc84b Mon Sep 17 00:00:00 2001 From: "rick.chan" Date: Fri, 14 Aug 2020 14:43:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=20commit?= =?UTF-8?q?=20id.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: rick.chan --- Software/Applications/Git/Git_使用说明.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Software/Applications/Git/Git_使用说明.md b/Software/Applications/Git/Git_使用说明.md index 5143cd1..dd62d7d 100644 --- a/Software/Applications/Git/Git_使用说明.md +++ b/Software/Applications/Git/Git_使用说明.md @@ -324,7 +324,7 @@ git rebase [-i] [upstream] 通过增加 -i 参数可进入交互模式。使用 Rebase 还可以将多次提交进行合并，或设置起止点。 ```bash -git rebase [-i] [start point] [end point] +git rebase [-i] [start commit id] [end commit id] ``` 如果发生了冲突，可以在解决冲突并 add 后，通过：