{"id":434,"date":"2023-06-03T11:31:52","date_gmt":"2023-06-03T03:31:52","guid":{"rendered":"https:\/\/niuguodong.com\/?p=434"},"modified":"2025-12-25T15:39:24","modified_gmt":"2025-12-25T07:39:24","slug":"git%e6%96%87%e4%bb%b6%e8%b7%9f%e8%b8%aa","status":"publish","type":"post","link":"https:\/\/niuguodong.com\/index.php\/2023\/06\/03\/git%e6%96%87%e4%bb%b6%e8%b7%9f%e8%b8%aa\/","title":{"rendered":"Git\u6587\u4ef6\u8ddf\u8e2a"},"content":{"rendered":"\n

\u5728Git\u4e2d\uff0c\u6587\u4ef6\u72b6\u6001\u662f\u7248\u672c\u63a7\u5236\u7684\u6838\u5fc3\u6982\u5ff5\uff0c\u4e3b\u8981\u5206\u4e3a\u516d\u5927\u7c7b<\/strong>\uff0c\u6bcf\u79cd\u72b6\u6001\u5bf9\u5e94\u4e0d\u540c\u7684\u64cd\u4f5c\u9636\u6bb5\u548c\u7248\u672c\u63a7\u5236\u903b\u8f91\u3002\u4ee5\u4e0b\u662f\u8be6\u7ec6\u89e3\u6790\uff1a<\/p>\n\n\n\n

\u516d\u79cd\u6587\u4ef6\u72b6\u6001<\/h2>\n\n\n\n

\u672a\u8ddf\u8e2a\uff08Untracked\uff09<\/strong><\/h3>\n\n\n\n
    \n
  • \u5b9a\u4e49<\/strong>\uff1a\u65b0\u521b\u5efa\u6216\u672a\u88abGit\u7ba1\u7406\u7684\u6587\u4ef6\uff0c\u672a\u52a0\u5165\u7248\u672c\u63a7\u5236\u3002<\/li>\n\n\n\n
  • \u89e6\u53d1\u6761\u4ef6<\/strong>\uff1a\u65b0\u6587\u4ef6\u9996\u6b21\u51fa\u73b0\u5728\u5de5\u4f5c\u76ee\u5f55\uff0c\u6216\u6587\u4ef6\u88ab.gitignore<\/code>\u6392\u9664\u540e\u672a\u88ab\u5f3a\u5236\u6dfb\u52a0\u3002<\/li>\n\n\n\n
  • \u793a\u4f8b<\/strong>\uff1a\u65b0\u521b\u5efa\u7684new_file.txt<\/code>\u6216\u88ab\u5ffd\u7565\u7684temp.log<\/code>\u3002<\/li>\n\n\n\n
  • \u8f6c\u6362\u64cd\u4f5c<\/strong>\uff1a<\/li>\n\n\n\n
  • \u901a\u8fc7git add <file><\/code>\u6216git add .<\/code>\u5c06\u6587\u4ef6\u52a0\u5165\u6682\u5b58\u533a\uff0c\u72b6\u6001\u8f6c\u4e3aStaged<\/code>\u3002<\/li>\n\n\n\n
  • \u82e5\u6587\u4ef6\u88ab.gitignore<\/code>\u6392\u9664\uff0c\u9700\u5148\u4fee\u6539\u5ffd\u7565\u89c4\u5219\u6216\u7528git add -f <file><\/code>\u5f3a\u5236\u8ddf\u8e2a\u3002<\/li>\n<\/ul>\n\n\n\n

    \u5df2\u8ddf\u8e2a\uff08Tracked\uff09\u7684\u5b50\u72b6\u6001<\/strong><\/h3>\n\n\n\n

    \u5df2\u8ddf\u8e2a\u6587\u4ef6\u662fGit\u5df2\u7ba1\u7406\u7684\u6587\u4ef6\uff0c\u6839\u636e\u4fee\u6539\u548c\u6682\u5b58\u60c5\u51b5\u5206\u4e3a\u4ee5\u4e0b\u5b50\u72b6\u6001\uff1a<\/p>\n\n\n\n

      \n
    • \u672a\u4fee\u6539\uff08Unmodified\uff09<\/strong>\uff1a<\/li>\n\n\n\n
    • \u6587\u4ef6\u5185\u5bb9\u4e0e\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u5b8c\u5168\u4e00\u81f4\uff0c\u65e0\u53d8\u66f4\u3002<\/li>\n\n\n\n
    • \u793a\u4f8b\uff1a\u63d0\u4ea4\u540e\u672a\u4fee\u6539\u7684README.md<\/code>\u3002<\/li>\n\n\n\n
    • \u8f6c\u6362\u64cd\u4f5c\uff1a\u4fee\u6539\u6587\u4ef6\u540e\u8f6c\u4e3aModified<\/code>\u3002<\/li>\n\n\n\n
    • \u5df2\u4fee\u6539\uff08Modified\uff09<\/strong>\uff1a<\/li>\n\n\n\n
    • \u6587\u4ef6\u88ab\u4fee\u6539\u4f46\u672a\u901a\u8fc7git add<\/code>\u6682\u5b58\u3002<\/li>\n\n\n\n
    • \u793a\u4f8b\uff1a\u7f16\u8f91CONTRIBUTING.md<\/code>\u540e\u672a\u6682\u5b58\u3002<\/li>\n\n\n\n
    • \u8f6c\u6362\u64cd\u4f5c\uff1a<\/li>\n\n\n\n
    • git add <file><\/code> \u2192 \u8f6c\u4e3aStaged<\/code>\u3002<\/li>\n\n\n\n
    • git checkout -- <file><\/code> \u2192 \u4e22\u5f03\u4fee\u6539\uff0c\u6062\u590d\u4e3aUnmodified<\/code>\u3002<\/li>\n\n\n\n
    • \u5df2\u6682\u5b58\uff08Staged\uff09<\/strong>\uff1a<\/li>\n\n\n\n
    • \u6587\u4ef6\u4fee\u6539\u5df2\u901a\u8fc7git add<\/code>\u52a0\u5165\u6682\u5b58\u533a\uff0c\u7b49\u5f85\u63d0\u4ea4\u3002<\/li>\n\n\n\n
    • \u793a\u4f8b\uff1agit add CONTRIBUTING.md<\/code>\u540e\u7684\u6587\u4ef6\u3002<\/li>\n\n\n\n
    • \u8f6c\u6362\u64cd\u4f5c\uff1a<\/li>\n\n\n\n
    • git commit<\/code> \u2192 \u8f6c\u4e3aCommitted<\/code>\u3002<\/li>\n\n\n\n
    • git reset HEAD <file><\/code> \u2192 \u53d6\u6d88\u6682\u5b58\uff0c\u8f6c\u56deModified<\/code>\u3002<\/li>\n\n\n\n
    • \u5df2\u63d0\u4ea4\uff08Committed\uff09<\/strong>\uff1a<\/li>\n\n\n\n
    • \u6587\u4ef6\u4fee\u6539\u5df2\u901a\u8fc7git commit<\/code>\u4fdd\u5b58\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u6210\u4e3a\u5386\u53f2\u8bb0\u5f55\u7684\u4e00\u90e8\u5206\u3002<\/li>\n\n\n\n
    • \u793a\u4f8b\uff1a\u63d0\u4ea4\u540e\u7684README.md<\/code>\u3002<\/li>\n\n\n\n
    • \u8f6c\u6362\u64cd\u4f5c\uff1a\u518d\u6b21\u4fee\u6539\u6587\u4ef6\u540e\u8f6c\u4e3aModified<\/code>\u3002<\/li>\n<\/ul>\n\n\n\n

      \u5ffd\u7565\uff08Ignored\uff09<\/strong><\/h3>\n\n\n\n
        \n
      • \u5b9a\u4e49<\/strong>\uff1a\u88ab.gitignore<\/code>\u6587\u4ef6\u660e\u786e\u6392\u9664\u7684\u6587\u4ef6\uff0cGit\u4e0d\u8ddf\u8e2a\u5176\u53d8\u66f4\u3002<\/li>\n\n\n\n
      • \u793a\u4f8b<\/strong>\uff1a*.log<\/code>\u3001dist\/<\/code>\u7b49\u3002<\/li>\n\n\n\n
      • \u7279\u6027<\/strong>\uff1a\u65e0\u6cd5\u901a\u8fc7git add<\/code>\u52a0\u5165\u7248\u672c\u63a7\u5236\uff08\u9664\u975e\u5f3a\u5236-f<\/code>\uff09\uff0c\u4e0d\u53c2\u4e0e\u4efb\u4f55\u72b6\u6001\u8f6c\u6362\u3002<\/li>\n<\/ul>\n\n\n\n

        \u5408\u5e76\u51b2\u7a81\uff08Unmerged\uff09<\/strong><\/h3>\n\n\n\n
          \n
        • \u5b9a\u4e49<\/strong>\uff1a\u5728\u5408\u5e76\u5206\u652f\u6216\u89e3\u51b3\u51b2\u7a81\u65f6\uff0c\u6587\u4ef6\u5b58\u5728\u65e0\u6cd5\u81ea\u52a8\u5408\u5e76\u7684\u53d8\u66f4\u3002<\/li>\n\n\n\n
        • \u89e6\u53d1\u6761\u4ef6<\/strong>\uff1a\u6267\u884cgit merge<\/code>\u6216git rebase<\/code>\u65f6\u51fa\u73b0\u51b2\u7a81\u3002<\/li>\n\n\n\n
        • \u793a\u4f8b<\/strong>\uff1a\u51b2\u7a81\u6807\u8bb0<<<<<<< HEAD<\/code>\u7684\u6587\u4ef6\u3002<\/li>\n\n\n\n
        • \u89e3\u51b3\u64cd\u4f5c<\/strong>\uff1a<\/li>\n\n\n\n
        • \u624b\u52a8\u7f16\u8f91\u6587\u4ef6\u89e3\u51b3\u51b2\u7a81\uff0c\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3\uff08git add <file><\/code>\uff09\u3002<\/li>\n\n\n\n
        • \u4f7f\u7528git merge --abort<\/code>\u6216git rebase --abort<\/code>\u4e2d\u6b62\u64cd\u4f5c\u3002<\/li>\n<\/ul>\n\n\n\n

          \u5df2\u5220\u9664\uff08Deleted\uff09<\/strong><\/h3>\n\n\n\n
            \n
          • \u5b9a\u4e49<\/strong>\uff1a\u5df2\u8ddf\u8e2a\u6587\u4ef6\u88ab\u5220\u9664\uff0c\u4e14\u53d8\u66f4\u5df2\u6682\u5b58\u6216\u63d0\u4ea4\u3002<\/li>\n\n\n\n
          • \u793a\u4f8b<\/strong>\uff1agit rm <file><\/code>\u540e\u7684\u6587\u4ef6\u3002<\/li>\n\n\n\n
          • \u8f6c\u6362\u64cd\u4f5c<\/strong>\uff1a<\/li>\n\n\n\n
          • git rm <file><\/code> \u2192 \u72b6\u6001\u8f6c\u4e3aStaged<\/code>\uff08\u5220\u9664\u64cd\u4f5c\u5df2\u6682\u5b58\uff09\u3002<\/li>\n\n\n\n
          • git commit<\/code> \u2192 \u8f6c\u4e3aCommitted<\/code>\uff0c\u6587\u4ef6\u4ece\u4ed3\u5e93\u4e2d\u79fb\u9664\u3002<\/li>\n\n\n\n
          • git restore <file><\/code> \u2192 \u6062\u590d\u5df2\u5220\u9664\u6587\u4ef6\uff08\u9700\u5728\u63d0\u4ea4\u524d\u64cd\u4f5c\uff09\u3002<\/li>\n<\/ul>\n\n\n\n

            \u91cd\u547d\u540d\uff08Renamed\uff09<\/strong><\/h3>\n\n\n\n
              \n
            • \u5b9a\u4e49<\/strong>\uff1a\u6587\u4ef6\u88ab\u91cd\u547d\u540d\uff0c\u4e14\u53d8\u66f4\u5df2\u901a\u8fc7git mv<\/code>\u6216git add<\/code>\u6682\u5b58\u3002<\/li>\n\n\n\n
            • \u793a\u4f8b<\/strong>\uff1agit mv old.txt new.txt<\/code>\u540e\u7684\u6587\u4ef6\u3002<\/li>\n\n\n\n
            • \u7279\u6027<\/strong>\uff1aGit\u901a\u8fc7\u5185\u5bb9\u54c8\u5e0c\u8bc6\u522b\u91cd\u547d\u540d\uff0c\u800c\u975e\u4ec5\u6587\u4ef6\u540d\u53d8\u66f4\u3002<\/li>\n<\/ul>\n\n\n\n

              \u72b6\u6001\u8f6c\u6362\u6d41\u7a0b<\/strong><\/h2>\n\n\n\n
                \n
              • \u6807\u51c6\u6d41\u7a0b<\/strong>\uff1aUntracked<\/code> \u2192 Modified<\/code> \u2192 Staged<\/code> \u2192 Committed<\/code>\u3002<\/li>\n\n\n\n
              • \u7279\u6b8a\u64cd\u4f5c<\/strong>\uff1a<\/li>\n\n\n\n
              • git checkout -- <file><\/code>\uff1a\u4e22\u5f03\u5de5\u4f5c\u533a\u4fee\u6539\uff0c\u6062\u590d\u4e3aUnmodified<\/code>\u3002<\/li>\n\n\n\n
              • git reset HEAD <file><\/code>\uff1a\u53d6\u6d88\u6682\u5b58\uff0c\u6062\u590d\u4e3aModified<\/code>\u3002<\/li>\n\n\n\n
              • git restore --staged <file><\/code>\uff1a\u4ece\u6682\u5b58\u533a\u64a4\u9500\uff0c\u4fdd\u7559\u5de5\u4f5c\u533a\u4fee\u6539\u3002<\/li>\n<\/ul>\n\n\n\n

                \u67e5\u770b\u72b6\u6001\u547d\u4ee4<\/strong><\/h2>\n\n\n\n
                  \n
                • git status<\/code>\uff1a\u8be6\u7ec6\u663e\u793a\u6240\u6709\u72b6\u6001\uff08\u5982Changes not staged for commit<\/code>\u3001Untracked files<\/code>\uff09\u3002<\/li>\n\n\n\n
                • git status -s<\/code>\uff1a\u7b80\u6d01\u6a21\u5f0f\uff0c\u7528\u7b26\u53f7\u6807\u8bb0\u72b6\u6001\uff08\u5982M<\/code>\u4fee\u6539\u3001A<\/code>\u65b0\u589e\u3001??<\/code>\u672a\u8ddf\u8e2a\uff09\u3002<\/li>\n<\/ul>\n\n\n\n

                  \u53d6\u6d88\u6682\u5b58<\/h2>\n\n\n\n
                  git restore --staged filename<\/code><\/pre>\n\n\n\n
                  \u8be5\u547d\u4ee4\u662f git add<\/code> \u7684\u64a4\u9500\u52a8\u4f5c\uff0c\u4f46\u4f1a\u4fdd\u7559\u5de5\u4f5c\u533a\u4e2d\u7684\u66f4\u6539\uff0c\u8fd8\u53ef\u4ee5\u91cd\u65b0\u4f7f\u7528git add\u518d\u6b21\u6682\u5b58\uff0c\u4e0d\u5f71\u54cd\u6587\u4ef6<\/p>\n\n\n\n
                  \u64a4\u9500\u66f4\u6539<\/h2>\n\n\n\n
                  # \u64a4\u9500\u6240\u6709\u672a\u6682\u5b58\u7684\u66f4\u6539\uff0c\u4e0d\u5305\u542b\u5df2\u7ecfgit add\u8fc7\u7684new\u6587\u4ef6\uff0c\u4e5f\u4e0d\u5305\u542b\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\ngit restore .<\/code><\/pre>\n\n\n\n
                  \u6ce8\u610f\uff1a\u614e\u7528\u6b64\u547d\u4ee4<\/p>\n\n\n\n
                  \u6062\u590d\u6587\u4ef6\u5230\u5386\u53f2\u7248\u672c<\/h2>\n\n\n\n
                  git restore --source=V1.0 filename<\/code><\/pre>\n\n\n\n
                  \u6682\u5b58\u5df2\u5ffd\u7565\u7684\u6587\u4ef6<\/p>\n\n\n\n
                  git add -f <file>    # \u5f3a\u5236\u5c06\u6587\u4ef6\u52a0\u5165\u6682\u5b58\u533a\uff08\u5373\u4f7f\u88ab\u5ffd\u7565\uff09<\/code><\/pre>\n\n\n\n
                  <\/p>\n","protected":false},"excerpt":{"rendered":"
                  \u5728Git\u4e2d\uff0c\u6587\u4ef6\u72b6\u6001\u662f\u7248\u672c\u63a7\u5236\u7684\u6838\u5fc3\u6982\u5ff5\uff0c\u4e3b\u8981\u5206\u4e3a\u516d\u5927\u7c7b\uff0c\u6bcf\u79cd\u72b6\u6001\u5bf9\u5e94\u4e0d\u540c\u7684\u64cd\u4f5c\u9636\u6bb5\u548c\u7248\u672c\u63a7\u5236\u903b\u8f91\u3002\u4ee5\u4e0b\u662f\u8be6\u7ec6 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[6,5],"tags":[],"class_list":["post-434","post","type-post","status-publish","format-standard","hentry","category-git","category-5"],"_links":{"self":[{"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/posts\/434","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/comments?post=434"}],"version-history":[{"count":0,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/posts\/434\/revisions"}],"wp:attachment":[{"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/media?parent=434"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/categories?post=434"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/tags?post=434"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}