{"id":402,"date":"2024-11-28T11:38:15","date_gmt":"2024-11-28T03:38:15","guid":{"rendered":"https:\/\/blog.kishere.cn\/?p=402"},"modified":"2025-08-08T10:25:42","modified_gmt":"2025-08-08T02:25:42","slug":"git%e5%b8%b8%e7%94%a8%e6%93%8d%e4%bd%9c","status":"publish","type":"post","link":"https:\/\/blog.kishere.cn\/?p=402","title":{"rendered":"git\u5e38\u7528\u64cd\u4f5c"},"content":{"rendered":"

git\u547d\u4ee4\u4e0e\u64cd\u4f5c<\/h1>\n

1. \u8fd8\u539f\u5230\u67d0\u6b21\u63d0\u4ea4<\/h2>\n
git reset --soft <commit ID> #\u4ec5\u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684\u6307\u9488\u5230\u6307\u5b9a\u7684\u63d0\u4ea4,\u4fdd\u7559\u6240\u6709\u66f4\u6539\ngit reset --soft <commit ID> #\u91cd\u7f6e\u7d22\u5f15\uff0c\u4fdd\u7559\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u66f4\u6539\ngit reset --hard <commit ID> #\u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684\u6307\u9488,\u4fdd\u7559\u671f\u95f4\u7684\u66f4\u6539\n<\/code><\/pre>\n
2.\u89e3\u51b3\u51b2\u7a81<\/h2>\n
git checkout --theirs -- <binary-file> #\u4fdd\u7559\u5f15\u5165\u7684\u4fee\u6539\ngit checkout --ours -- <binary-file> #\u4fdd\u7559\u73b0\u6709\u7684\u4fee\u6539\ngit add <binary-file> #\u5c06\u4fee\u6539\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\n<\/code><\/pre>\n
3.\u63d0\u53d6\u5355\u6b21\u63d0\u4ea4<\/h2>\n
git cherry-pick <commit-hash>\n<\/code><\/pre>\n
4.\u53d8\u57fa<\/h2>\n
git rebase -i HEAD~n #\u53d8\u57fa\u6700\u8fd1\u7684n\u6b21\u63d0\u4ea4\n<\/code><\/pre>\n
\u6267\u884c\u540e\u4f1a\u663e\u793a\u7f16\u8f91\u5668:<\/h4>\n
pick abcdef1 Commit message 1 #\u8fd9\u91cc\u4e0d\u8981\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\uff0c\u53ea\u4fee\u6539\u547d\u4ee4\u9009\u62e9\u9700\u8981\u7684\u63d0\u4ea4\npick abcdef2 Commit message 2\npick abcdef3 Commit message 3\n<\/code><\/pre>\n
pick\u547d\u4ee4\u53ef\u4fee\u6539\u4e3a\uff1a<\/p>\n
    \n
  • pick\uff1a\u4fdd\u7559\u63d0\u4ea4<\/li>\n
  • reword\uff1a\u4fdd\u7559\u63d0\u4ea4\u5e76\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f<\/li>\n
  • edit\uff1a\u4fdd\u7559\u63d0\u4ea4\u5e76\u5141\u8bb8\u4f60\u4fee\u6539\u5185\u5bb9<\/li>\n
  • squash\uff1a\u5c06\u6b64\u63d0\u4ea4\u4e0e\u524d\u4e00\u4e2a\u63d0\u4ea4\u5408\u5e76<\/li>\n
  • fixup\uff1a\u4e0e\u524d\u4e00\u4e2a\u63d0\u4ea4\u5408\u5e76\uff0c\u4e0d\u4fdd\u7559\u63d0\u4ea4\u4fe1\u606f<\/li>\n
  • drop\uff1a\u5220\u9664\u63d0\u4ea4<\/li>\n<\/ul>\n
    \u5982\u679c\u9ed8\u8ba4\u7f16\u8f91\u5668\u6253\u4e0d\u5f00\uff0c\u7528\u8fd9\u4e2a\u547d\u4ee4\u66f4\u6539\u9ed8\u8ba4\u7f16\u8f91\u5668\uff1a<\/p>\n
    git config --global core.editor vim\n<\/code><\/pre>\n
    \u5982\u679c\u4fee\u6539\u4e86\u5df2\u7ecf\u63a8\u9001\u7684\u63d0\u4ea4\uff0c\u5219\u9700\u8981\u5f3a\u5236\u63a8\u9001<\/p>\n
    git push origin <branch-name> --force-with-lease\n<\/code><\/pre>\n
    \u64a4\u9500\u63d0\u4ea4<\/h2>\n
    \u4f1a\u751f\u6210\u4e00\u4e2a\u53cd\u5411\u63d0\u4ea4\uff0c\u63d0\u4ea4\u7684\u5185\u5bb9\u662f\u8981\u64a4\u9500\u7684\u63d0\u4ea4\u7684\u53cd\u5411\u66f4\u6539\u3002<\/p>\n
    git revert <commit_hash>\ngit revert -n <commit_hash> #\u4fdd\u7559\u53cd\u5411\u4fee\u6539\uff0c\u4f46\u4e0d\u63d0\u4ea4\n<\/code><\/pre>\n
    fork\u4ed3\u5e93\u7684\u540c\u6b65<\/h2>\n
    git remote -v #\u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\u4fe1\u606f\ngit remote add upstream <url>\ngit fetch upstream\ngit checkout master\ngit merge upstream\/master\ngit push\n<\/code><\/pre>\n
    \u8865\u4e01\u6587\u4ef6<\/h2>\n
    \u751f\u6210\u8865\u4e01\u6587\u4ef6<\/p>\n
    git format-patch -1 <commit_hash>\ngit format-patch -3 #\u751f\u6210\u6700\u8fd1\u7684 3 \u4e2a\u63d0\u4ea4\u7684\u8865\u4e01\ngit format-patch -3 -o \/path\/to\/patches #\u6307\u5b9a\u751f\u6210\u8def\u5f84\n\ngit stash show -p > stash_patch.patch #\u6700\u8fd1\u4e00\u6b21stash\ngit stash show -p stash@{index} > stash_patch.patch #\u6307\u5b9a\u7684stash\n\ngit diff > changes.patch #\u672a\u63d0\u4ea4\u7684\u4fee\u6539\u751f\u6210\u8865\u4e01\u6587\u4ef6\ngit diff --cached > staged_changes.patch #\u4ece\u6682\u5b58\u533a\u751f\u6210\u8865\u4e01\u6587\u4ef6\n\n#\u751f\u6210\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u8865\u4e01\u6587\u4ef6\ngit diff <commit1> <commit2> > changes_between_commits.patch\n\n#\u4ecebase_branch\u5230feature_branch\u7684\u63d0\u4ea4\u751f\u6210\u8865\u4e01\u6587\u4ef6\ngit format-patch <base_branch>..<feature_branch>\n<\/code><\/pre>\n
    \u5e94\u7528\u8865\u4e01\u6587\u4ef6\uff1a<\/p>\n
    git apply my_patch.patch\ngit am my_patch.patch #\u5e94\u7528\u5e76\u521b\u5efa\u63d0\u4ea4\n<\/code><\/pre>\n
    \u5de5\u4f5c\u6811<\/h2>\n
    worktree\u53ef\u4ee5\u5c06\u591a\u4e2a\u5206\u652f\u5206\u5e03\u5728\u4e0d\u540c\u7684\u8def\u5f84\u4e0b\uff0c\u4e14\u5171\u7528\u4e00\u4e2agit\u4ed3\u5e93\u3002\u4ed6\u4eec\u4e4b\u95f4\u53ef\u4ee5\u4e92\u76f8\u534f\u4f5c\uff08megre\u3001cherrypick\uff09<\/p>\n
    git worktree add \/pathtoworktree brach #\u4e3abrach\u5206\u652f\u5728\/pathtoworktree\u4f4d\u7f6e\u521b\u5efaworktree\ngit worktree list #\u5217\u51fa\u6240\u6709worktree\ngit worktree prune #\u5220\u9664worktree\u76ee\u5f55\u540e\u518d\u6267\u884c\n<\/code><\/pre>\n
    Git\u914d\u7f6e<\/h2>\n
    git config --list #\u83b7\u53d6\u9ed8\u8ba4\u914d\u7f6e\ngit config --global http.proxy http:\/\/127.0.0.1:7890 #\u66f4\u6539http\u4ee3\u7406\u8bbe\u7f6e\ngit config --global https.proxy http:\/\/127.0.0.1:7890 #\u66f4\u6539https\u4ee3\u7406\u8bbe\u7f6e\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"
    git\u547d\u4ee4\u4e0e\u64cd\u4f5c 1. \u8fd8\u539f\u5230\u67d0\u6b21\u63d0\u4ea4 git reset –soft <commit ID> #\u4ec5\u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684\u6307\u9488\u5230\u6307\u5b9a\u7684\u63d0\u4ea4,\u4fdd\u7559\u6240\u6709\u66f4\u6539 git reset –soft <commit ID> #\u91cd\u7f6e\u7d22\u5f15\uff0c\u4fdd\u7559\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u66f4\u6539 git reset –hard <commit ID> #\u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684\u6307\u9488,\u4fdd\u7559\u671f\u95f4\u7684\u66f4\u6539 2.\u89e3\u51b3\u51b2\u7a81 git checkout –theirs — <binary-file> #\u4fdd\u7559\u5f15\u5165\u7684\u4fee\u6539 git checkout –ours — <binary-file> #\u4fdd\u7559\u73b0\u6709\u7684\u4fee\u6539 git add <binary-file> #\u5c06\u4fee\u6539\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a 3.\u63d0\u53d6\u5355\u6b21\u63d0\u4ea4 git cherry-pick <commit-hash> 4.\u53d8\u57fa git rebase -i HEAD~n #\u53d8\u57fa\u6700\u8fd1\u7684n\u6b21\u63d0\u4ea4 \u6267\u884c\u540e\u4f1a\u663e\u793a\u7f16\u8f91\u5668: pick abcdef1 Commit message 1 #\u8fd9\u91cc\u4e0d\u8981\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\uff0c\u53ea\u4fee\u6539\u547d\u4ee4\u9009\u62e9\u9700\u8981\u7684\u63d0\u4ea4 pick abcdef2 Commit message 2 pick abcdef3 Commit message 3 pick\u547d\u4ee4\u53ef\u4fee\u6539\u4e3a\uff1a pick\uff1a\u4fdd\u7559\u63d0\u4ea4 reword\uff1a\u4fdd\u7559\u63d0\u4ea4\u5e76\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f edit\uff1a\u4fdd\u7559\u63d0\u4ea4\u5e76\u5141\u8bb8\u4f60\u4fee\u6539\u5185\u5bb9 squash\uff1a\u5c06\u6b64\u63d0\u4ea4\u4e0e\u524d\u4e00\u4e2a\u63d0\u4ea4\u5408\u5e76 fixup\uff1a\u4e0e\u524d\u4e00\u4e2a\u63d0\u4ea4\u5408\u5e76\uff0c\u4e0d\u4fdd\u7559\u63d0\u4ea4\u4fe1\u606f drop\uff1a\u5220\u9664\u63d0\u4ea4 \u5982\u679c\u9ed8\u8ba4\u7f16\u8f91\u5668\u6253\u4e0d\u5f00\uff0c\u7528\u8fd9\u4e2a\u547d\u4ee4\u66f4\u6539\u9ed8\u8ba4\u7f16\u8f91\u5668\uff1a git config –global core.editor vim \u5982\u679c\u4fee\u6539\u4e86\u5df2\u7ecf\u63a8\u9001\u7684\u63d0\u4ea4\uff0c\u5219\u9700\u8981\u5f3a\u5236\u63a8\u9001 git push origin <branch-name> –force-with-lease \u64a4\u9500\u63d0\u4ea4 \u4f1a\u751f\u6210\u4e00\u4e2a\u53cd\u5411\u63d0\u4ea4\uff0c\u63d0\u4ea4\u7684\u5185\u5bb9\u662f\u8981\u64a4\u9500\u7684\u63d0\u4ea4\u7684\u53cd\u5411\u66f4\u6539\u3002 git revert <commit_hash> git revert -n <commit_hash> #\u4fdd\u7559\u53cd\u5411\u4fee\u6539\uff0c\u4f46\u4e0d\u63d0\u4ea4 fork\u4ed3\u5e93\u7684\u540c\u6b65 git remote -v #\u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\u4fe1\u606f git remote add upstream <url> git fetch upstream git checkout master git merge upstream\/master git push \u8865\u4e01\u6587\u4ef6 \u751f\u6210\u8865\u4e01\u6587\u4ef6 git format-patch -1 <commit_hash> git format-patch -3 #\u751f\u6210\u6700\u8fd1\u7684 3 \u4e2a\u63d0\u4ea4\u7684\u8865\u4e01 git format-patch -3 -o \/path\/to\/patches #\u6307\u5b9a\u751f\u6210\u8def\u5f84 git stash show -p > stash_patch.patch #\u6700\u8fd1\u4e00\u6b21stash git stash show -p stash@{index} > stash_patch.patch #\u6307\u5b9a\u7684stash git diff > changes.patch #\u672a\u63d0\u4ea4\u7684\u4fee\u6539\u751f\u6210\u8865\u4e01\u6587\u4ef6 git diff –cached > staged_changes.patch #\u4ece\u6682\u5b58\u533a\u751f\u6210\u8865\u4e01\u6587\u4ef6 #\u751f\u6210\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u8865\u4e01\u6587\u4ef6 git diff <commit1> <commit2> > changes_between_commits.patch #\u4ecebase_branch\u5230feature_branch\u7684\u63d0\u4ea4\u751f\u6210\u8865\u4e01\u6587\u4ef6 git format-patch <base_branch>..<feature_branch> \u5e94\u7528\u8865\u4e01\u6587\u4ef6\uff1a git apply my_patch.patch git am my_patch.patch #\u5e94\u7528\u5e76\u521b\u5efa\u63d0\u4ea4 \u5de5\u4f5c\u6811 worktree\u53ef\u4ee5\u5c06\u591a\u4e2a\u5206\u652f\u5206\u5e03\u5728\u4e0d\u540c\u7684\u8def\u5f84\u4e0b\uff0c\u4e14\u5171\u7528\u4e00\u4e2agit\u4ed3\u5e93\u3002\u4ed6\u4eec\u4e4b\u95f4\u53ef\u4ee5\u4e92\u76f8\u534f\u4f5c\uff08megre\u3001cherrypick\uff09 git worktree add \/pathtoworktree brach #\u4e3abrach\u5206\u652f\u5728\/pathtoworktree\u4f4d\u7f6e\u521b\u5efaworktree git worktree list #\u5217\u51fa\u6240\u6709worktree git worktree prune #\u5220\u9664worktree\u76ee\u5f55\u540e\u518d\u6267\u884c Git\u914d\u7f6e git config –list #\u83b7\u53d6\u9ed8\u8ba4\u914d\u7f6e git config –global http.proxy http:\/\/127.0.0.1:7890 #\u66f4\u6539http\u4ee3\u7406\u8bbe\u7f6e git config –global https.pro…<\/p>\n","protected":false},"author":1,"featured_media":403,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"inline_featured_image":false,"footnotes":""},"categories":[1],"tags":[],"_links":{"self":[{"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=\/wp\/v2\/posts\/402"}],"collection":[{"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=402"}],"version-history":[{"count":11,"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=\/wp\/v2\/posts\/402\/revisions"}],"predecessor-version":[{"id":421,"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=\/wp\/v2\/posts\/402\/revisions\/421"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=\/wp\/v2\/media\/403"}],"wp:attachment":[{"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=402"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=402"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.kishere.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=402"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}