From 65f9176088955714aae1c10a8cb0dffa5efedd5a Mon Sep 17 00:00:00 2001 From: Ziqiang Wu Date: Tue, 1 Apr 2025 23:21:17 +0800 Subject: [PATCH 1/3] Create git-checkout-index.md --- pages.zh/common/git-checkout-index.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pages.zh/common/git-checkout-index.md diff --git a/pages.zh/common/git-checkout-index.md b/pages.zh/common/git-checkout-index.md new file mode 100644 index 00000000000000..2dc0f0aa33f719 --- /dev/null +++ b/pages.zh/common/git-checkout-index.md @@ -0,0 +1,20 @@ +# git checkout-index + +> 将文件从暂存区复制到工作区。 +> 更多信息:. + +- 恢复自上次提交以来删除的所有文件: + +`git checkout-index --all` + +- 恢复自上次提交以来删除或修改的所有文件(强制覆盖): + +`git checkout-index --all --force` + +- 恢复自上次提交以来修改的文件(忽略已删除的文件): + +`git checkout-index --all --force --no-create` + +- 将最后一次提交的整个工作树导出到指定目录(注意结尾斜杠): + +`git checkout-index --all --force --prefix={{路径/到/导出目录/}}` From c1512d828130a9d0d1deefe5c751c3d973d455c4 Mon Sep 17 00:00:00 2001 From: Ziqiang Wu Date: Tue, 1 Apr 2025 23:27:16 +0800 Subject: [PATCH 2/3] Create git-cherry.md --- pages.zh/common/git-cherry.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pages.zh/common/git-cherry.md diff --git a/pages.zh/common/git-cherry.md b/pages.zh/common/git-cherry.md new file mode 100644 index 00000000000000..73d7127a833e21 --- /dev/null +++ b/pages.zh/common/git-cherry.md @@ -0,0 +1,16 @@ +# git cherry + +> 查找尚未应用到上游分支的提交。 +> 更多信息:. + +- 显示已在上游分支有对应提交的提交(包含提交信息): + +`git cherry {{[-v|--verbose]}}` + +- 指定不同的上游分支和主题分支进行比较: + +`git cherry {{上游分支}} {{主题分支}}` + +- 限定比较范围到某个基准点之后的提交: + +`git cherry {{上游分支}} {{主题分支}} {{基准点}}` From 4fb2d489cdc1b09aaed0854baa90721cb079dfb9 Mon Sep 17 00:00:00 2001 From: Ziqiang Wu Date: Tue, 1 Apr 2025 23:35:52 +0800 Subject: [PATCH 3/3] Create git-cherry-pick.md --- pages.zh/common/git-cherry-pick.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 pages.zh/common/git-cherry-pick.md diff --git a/pages.zh/common/git-cherry-pick.md b/pages.zh/common/git-cherry-pick.md new file mode 100644 index 00000000000000..d791d6049304b8 --- /dev/null +++ b/pages.zh/common/git-cherry-pick.md @@ -0,0 +1,21 @@ +# git cherry-pick + +> 将现有提交的变更应用到当前分支。 +> 如需应用到其他分支,请先用 `git checkout` 切换到目标分支。 +> 更多信息:. + +- 将单个提交应用到当前分支: + +`git cherry-pick {{提交哈希}}` + +- 将连续多个提交应用到当前分支(也可参考 `git rebase --onto`): + +`git cherry-pick {{起始提交}}~..{{结束提交}}` + +- 将多个(非连续的)提交应用到当前分支: + +`git cherry-pick {{提交1 提交2 ...}}` + +- 将提交变更应用到工作区但不自动创建提交: + +`git cherry-pick --no-commit {{提交哈希}}`