{"id":2280,"date":"2019-04-25T17:35:36","date_gmt":"2019-04-25T09:35:36","guid":{"rendered":"https:\/\/feizhaojun.com\/?p=2280"},"modified":"2020-02-02T16:23:19","modified_gmt":"2020-02-02T08:23:19","slug":"git%e6%94%be%e5%bc%83%e6%9c%ac%e5%9c%b0%e4%bf%ae%e6%94%b9","status":"publish","type":"post","link":"https:\/\/feizhaojun.com\/?p=2280","title":{"rendered":"git\u653e\u5f03\u672c\u5730\u4fee\u6539"},"content":{"rendered":"<p>\u5982\u679c\u4f60\u5728\u5f00\u53d1\u7684\u65f6\u5019\uff0c\u53d1\u73b0\u4fee\u6539\u9519\u8bef\uff0c\u60f3\u76f4\u63a5\u653e\u5f03\u81ea\u5df1\u7684\u4fee\u6539\uff0c\u6216\u8005\u4ece\u8fdc\u7a0b\u4ee3\u7801\u91cd\u65b0\u4e0b\u8f7d\u4e00\u4efd\u8986\u76d6\u81ea\u5df1\u7684\u4ee3\u7801\uff0c\u9664\u4e86\u76f4\u63a5\u91cd\u65b0 clone \u4e00\u4efd\u4e4b\u5916\uff0c\u8fd8\u6709\u5982\u4e0b\u65b9\u6cd5\uff1a<\/p>\n<h2>\u672a\u4f7f\u7528 git add \u6682\u5b58\u4ee3\u7801<\/h2>\n<pre><code class=\"language-shell\">git checkout -- &lt;filenme&gt;\n\/\/ \u4f8b\u5982\uff1a\ngit checkout -- README.md\n<\/code><\/pre>\n<p>\u4e0d\u8981\u5fd8\u8bb0\u4e2d\u95f4\u7684\u201c--\u201d\uff0c\u4e0d\u7136\u5c31\u4f1a\u68c0\u51fa\u5206\u652f\u3002\u653e\u5f03\u6240\u6709\u6587\u4ef6\u4fee\u6539\u53ef\u4ee5\u7528\uff1a<\/p>\n<pre><code class=\"language-shell\">git checkout .\n<\/code><\/pre>\n<p>\u6b64\u547d\u4ee4\u7528\u6765\u653e\u5f03\u6240\u6709\u672a\u6682\u5b58\uff08Unstaged\uff09\uff0c\u5c31\u662f\u8fd8\u6ca1\u6709\u201cgit add\u201d\u7684\u4fee\u6539\u3002\u5185\u5bb9\u4fee\u6539\u4e0e\u6574\u4e2a\u6587\u4ef6\u90fd\u4f1a\u5220\u9664\uff0c\u4f46\u662f\u6b64\u4e0d\u4f1a\u5220\u9664\u521a\u65b0\u5efa\u7684\u6587\u4ef6\uff0c\u56e0\u4e3a\u521a\u65b0\u5efa\u7684\u6587\u4ef6\u8fd8\u6ca1\u5df2\u6709\u52a0\u5165\u5230 git \u7684\u7ba1\u7406\u7cfb\u7edf\u4e2d\uff08Untracked\uff09\uff0c\u8fd9\u79cdgit\u7ba1\u4e0d\u7740\uff0c\u81ea\u5df1\u624b\u52a8\u5220\u9664\u5c31\u597d\u4e86\u3002<\/p>\n<h2>\u5df2\u7ecf\u4f7f\u7528 git add \u6682\u5b58\u4ee3\u7801<\/h2>\n<pre><code class=\"language-shell\">git reset HEAD &lt;filenme&gt;\n\/\/ \u4f8b\u5982\uff1a\ngit reset HEAD README.md\n<\/code><\/pre>\n<p>\u653e\u5f03\u6240\u6709\u6682\u5b58\u6587\u4ef6\uff1a<\/p>\n<pre><code class=\"language-shell\">git reset HEAD .\n<\/code><\/pre>\n<p>\u8be5\u547d\u4ee4\u53ef\u4ee5\u64a4\u9500\u6682\u5b58\uff0c\u76f8\u5f53\u4e8e\u64a4\u9500\u201cgit add\u201d\uff0c\u6267\u884c\u540e\u672c\u5730\u4fee\u6539\u4e0d\u4f1a\u6d88\u5931\uff0c\u800c\u662f\u56de\u5230\u201c\u672a\u6682\u5b58\u201d\u72b6\u6001\uff0c\u8fd9\u65f6\u5019\u5c31\u53ef\u4ee5\u7528\u4e0a\u9762\u63d0\u5230\u7684\u201cgit checkout -- <filename>\u201d\u653e\u5f03\u672c\u5730\u4fee\u6539\u3002<\/p>\n<h2>\u5df2\u7ecf\u4f7f\u7528 git commit \u63d0\u4ea4\u4ee3\u7801<\/h2>\n<pre><code class=\"language-shell\">git reset --hard HEAD^\n<\/code><\/pre>\n<p>\u8be5\u547d\u4ee4\u4f1a\u56de\u6eda\u5230\u4e0a\u4e00\u4e2acommit\u3002<br \/>\n\u4e5f\u53ef\u4ee5\u56de\u6eda\u5230\u4efb\u610f\u4e00\u4e2acommit\uff1a<\/p>\n<pre><code class=\"language-shell\">git reset --hard &lt;commitid&gt;\n<\/code><\/pre>\n<p>\u53ef\u4ee5\u4f7f\u7528\u201cgit log\u201d\u67e5\u770bcommit ID\u3002<\/filename><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5982\u679c\u4f60\u5728\u5f00\u53d1\u7684\u65f6\u5019\uff0c\u53d1\u73b0\u4fee\u6539\u9519\u8bef\uff0c\u60f3\u76f4\u63a5\u653e\u5f03\u81ea\u5df1\u7684\u4fee\u6539\uff0c\u6216\u8005\u4ece\u8fdc\u7a0b\u4ee3\u7801\u91cd\u65b0\u4e0b\u8f7d\u4e00\u4efd\u8986\u76d6\u81ea\u5df1\u7684\u4ee3\u7801\uff0c\u9664\u4e86\u76f4\u63a5\u91cd\u65b0 clon&#8230;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[75,14],"tags":[76],"class_list":["post-2280","post","type-post","status-publish","format-standard","hentry","category-75","category--software","tag-git"],"jetpack_sharing_enabled":true,"jetpack_featured_media_url":"","_links":{"self":[{"href":"https:\/\/feizhaojun.com\/index.php?rest_route=\/wp\/v2\/posts\/2280","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/feizhaojun.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/feizhaojun.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/feizhaojun.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/feizhaojun.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=2280"}],"version-history":[{"count":1,"href":"https:\/\/feizhaojun.com\/index.php?rest_route=\/wp\/v2\/posts\/2280\/revisions"}],"predecessor-version":[{"id":2281,"href":"https:\/\/feizhaojun.com\/index.php?rest_route=\/wp\/v2\/posts\/2280\/revisions\/2281"}],"wp:attachment":[{"href":"https:\/\/feizhaojun.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=2280"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/feizhaojun.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=2280"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/feizhaojun.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=2280"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}