{"id":21211,"date":"2024-11-19T09:45:26","date_gmt":"2024-11-19T01:45:26","guid":{"rendered":"https:\/\/fwq.ai\/blog\/21211\/"},"modified":"2024-11-19T09:45:26","modified_gmt":"2024-11-19T01:45:26","slug":"git%e6%8f%90%e4%ba%a4%e5%88%b0%e6%9c%ac%e5%9c%b0%e6%80%8e%e4%b9%88%e6%92%a4%e9%94%80","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/21211\/","title":{"rendered":"git\u63d0\u4ea4\u5230\u672c\u5730\u600e\u4e48\u64a4\u9500"},"content":{"rendered":"

\n \u64a4\u9500 git \u672c\u5730\u63d0\u4ea4\u7684\u65b9\u6cd5\uff1a\u68c0\u67e5\u5f53\u524d\u72b6\u6001\u64a4\u9500\u6682\u5b58\u533a\u4fee\u6539\uff1agit reset head \u64a4\u9500\u5df2\u63d0\u4ea4\u7684\u66f4\u6539\uff1agit reset –soft head^\u786e\u8ba4\u66f4\u6539\n<\/p><\/blockquote>\n

\"git\u63d0\u4ea4\u5230\u672c\u5730\u600e\u4e48\u64a4\u9500\u63d2\u56fe\"<\/p>\n

\u5982\u4f55\u64a4\u9500 Git \u672c\u5730\u63d0\u4ea4<\/strong><\/p>\n

\u64a4\u9500 Git \u672c\u5730\u63d0\u4ea4\u975e\u5e38\u7b80\u5355\uff0c\u53ea\u9700\u8981\u51e0\u4e2a\u547d\u4ee4\u5373\u53ef\u3002<\/p>\n

\u6b65\u9aa4\uff1a<\/strong><\/p>\n

1. \u68c0\u67e5\u5f53\u524d\u72b6\u6001\uff1a<\/strong><\/p>\n

\u4f7f\u7528 status \u547d\u4ee4\u67e5\u770b\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u548c\u6682\u5b58\u533a\u7684\u72b6\u6001\u3002<\/p>\n

2. \u64a4\u9500\u6682\u5b58\u533a\u4fee\u6539\uff1a<\/strong><\/p>\n

\u5982\u679c\u53ea\u60f3\u8981\u64a4\u9500\u6682\u5b58\u7684\u6587\u4ef6\uff0c\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n

git reset HEAD <\u6587\u4ef6\u540d><\/pre>\n
 \u767b\u5f55\u540e\u590d\u5236 <\/p>\n
3. \u64a4\u9500\u5df2\u63d0\u4ea4\u7684\u66f4\u6539\uff1a<\/strong><\/p>\n
\u5982\u679c\u60f3\u8981\u64a4\u9500\u5df2\u63d0\u4ea4\u7684\u66f4\u6539\uff0c\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
git reset --soft HEAD^<\/pre>\n
 \u767b\u5f55\u540e\u590d\u5236 <\/p>\n
4. \u786e\u8ba4\u66f4\u6539\uff1a<\/strong><\/p>\n
\u4f7f\u7528 git status \u547d\u4ee4\u518d\u6b21\u68c0\u67e5\u72b6\u6001\uff0c\u786e\u8ba4\u66f4\u6539\u662f\u5426\u5df2\u88ab\u64a4\u9500\u3002<\/p>\n
\u5176\u4ed6\u60c5\u51b5\uff1a<\/strong><\/p>\n
\u64a4\u9500\u5408\u5e76\u63d0\u4ea4\uff1a<\/strong><\/p>\n
\u8981\u64a4\u9500\u5408\u5e76\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
git reset --mixed <commit-id>^<\/pre>\n
 \u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u5176\u4e2d \u662f\u5408\u5e76\u63d0\u4ea4\u7684 ID\u3002 <\/p>\n
\u64a4\u9500\u6240\u6709\u672c\u5730\u66f4\u6539\uff1a<\/strong><\/p>\n
\u8981\u64a4\u9500\u6240\u6709\u672c\u5730\u66f4\u6539\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
git reset --hard HEAD<\/pre>\n
 \u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u8b66\u544a\uff1a<\/strong> \u4f7f\u7528 –hard \u9009\u9879\u65f6\u8981\u5c0f\u5fc3\uff0c\u56e0\u4e3a\u5b83\u4f1a\u5220\u9664\u6240\u6709\u672a\u63d0\u4ea4\u7684\u66f4\u6539\u3002\u4f7f\u7528 –soft \u9009\u9879\u53ef\u4ee5\u4fdd\u7559\u672a\u63d0\u4ea4\u7684\u66f4\u6539\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662f\u63d0\u4ea4\u5230\u672c\u5730\u600e\u4e48\u64a4\u9500\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"
\u64a4\u9500 git \u672c\u5730\u63d0\u4ea4\u7684\u65b9\u6cd5\uff1a\u68c0\u67e5\u5f53\u524d\u72b6\u6001\u64a4\u9500\u6682\u5b58\u533a\u4fee\u6539\uff1agit reset head \u64a4\u9500\u5df2\u63d0\u4ea4\u7684\u66f4\u6539\uff1agit reset –soft head^\u786e\u8ba4\u66f4\u6539 \u5982\u4f55\u64a4\u9500 Git \u672c\u5730\u63d0\u4ea4 \u64a4\u9500 Git \u672c\u5730\u63d0\u4ea4\u975e\u5e38\u7b80\u5355\uff0c\u53ea\u9700\u8981\u51e0\u4e2a\u547d\u4ee4\u5373\u53ef\u3002 \u6b65\u9aa4\uff1a 1. \u68c0\u67e5\u5f53\u524d\u72b6\u6001\uff1a \u4f7f\u7528 status \u547d\u4ee4\u67e5\u770b\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u548c\u6682\u5b58\u533a\u7684\u72b6\u6001\u3002 2. \u64a4\u9500\u6682\u5b58\u533a\u4fee\u6539\uff1a \u5982\u679c\u53ea\u60f3\u8981\u64a4\u9500\u6682\u5b58\u7684\u6587\u4ef6\uff0c\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a git reset HEAD <\u6587\u4ef6\u540d> \u767b\u5f55\u540e\u590d\u5236 3. \u64a4\u9500\u5df2\u63d0\u4ea4\u7684\u66f4\u6539\uff1a \u5982\u679c\u60f3\u8981\u64a4\u9500\u5df2\u63d0\u4ea4\u7684\u66f4\u6539\uff0c\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a git reset –soft HEAD^ \u767b\u5f55\u540e\u590d\u5236 4. \u786e\u8ba4\u66f4\u6539\uff1a \u4f7f\u7528 git status \u547d\u4ee4\u518d\u6b21\u68c0\u67e5\u72b6\u6001\uff0c\u786e\u8ba4\u66f4\u6539\u662f\u5426\u5df2\u88ab\u64a4\u9500\u3002 \u5176\u4ed6\u60c5\u51b5\uff1a \u64a4\u9500\u5408\u5e76\u63d0\u4ea4\uff1a \u8981\u64a4\u9500\u5408\u5e76\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a git reset –mixed <commit-id>^ \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d \u662f\u5408\u5e76\u63d0\u4ea4\u7684 ID\u3002 \u64a4\u9500\u6240\u6709\u672c\u5730\u66f4\u6539\uff1a […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-21211","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/21211","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=21211"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/21211\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=21211"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=21211"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=21211"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}