{"id":19921,"date":"2024-11-19T13:42:32","date_gmt":"2024-11-19T05:42:32","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19921\/"},"modified":"2024-11-19T13:42:32","modified_gmt":"2024-11-19T05:42:32","slug":"git%e6%80%8e%e4%b9%88%e6%9f%a5%e7%9c%8b%e7%89%88%e6%9c%ac%e6%98%af%e4%b8%8d%e6%98%af%e6%9c%80%e6%96%b0%e7%9a%84","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19921\/","title":{"rendered":"git\u600e\u4e48\u67e5\u770b\u7248\u672c\u662f\u4e0d\u662f\u6700\u65b0\u7684"},"content":{"rendered":"

\u968f\u7740\u8f6f\u4ef6\u5f00\u53d1\u7684\u65e5\u76ca\u590d\u6742\u548c\u56e2\u961f\u534f\u4f5c\u7684\u52a0\u6df1\uff0c\u4ee3\u7801\u7ba1\u7406\u548c\u7248\u672c\u63a7\u5236\u53d8\u5f97\u6108\u53d1\u91cd\u8981\u3002git\u4f5c\u4e3a\u76ee\u524d\u5e7f\u6cdb\u4f7f\u7528\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u53ef\u4ee5\u5e2e\u52a9\u56e2\u961f\u9ad8\u6548\u534f\u4f5c\u3001\u7ba1\u7406\u4ee3\u7801\u5e76\u8ffd\u8e2a\u7248\u672c\u3002\u4f46\u662f\u5728\u65e5\u5e38\u5f00\u53d1\u4e2d\uff0c\u53ef\u80fd\u4f1a\u9047\u5230\u67e5\u770b\u5f53\u524d\u7248\u672c\u662f\u5426\u662f\u6700\u65b0\u7684\u95ee\u9898\u3002\u90a3\u4e48\uff0c\u5982\u4f55\u4f7f\u7528git\u67e5\u770b\u7248\u672c\u662f\u5426\u662f\u6700\u65b0\u7684\u5462\uff1f<\/p>\n

Git\u662f\u4e00\u6b3e\u5206\u5e03\u5f0f\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u6bcf\u4e2a\u5f00\u53d1\u8005\u90fd\u53ef\u4ee5\u62e5\u6709\u81ea\u5df1\u7684\u672c\u5730\u7248\u672c\u5e93\u3002\u5728\u4ee3\u7801\u66f4\u65b0\u65f6\uff0c\u5f00\u53d1\u8005\u9700\u8981\u5c06\u66f4\u65b0\u63a8\u9001\u5230\u8fdc\u7a0b\u7684\u7248\u672c\u5e93\u4e2d\uff0c\u5176\u4ed6\u5f00\u53d1\u8005\u518d\u4ece\u7248\u672c\u5e93\u4e2d\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002\u8fd9\u5c31\u9700\u8981\u67e5\u770b\u5f53\u524d\u672c\u5730\u4ee3\u7801\u7248\u672c\u662f\u5426\u662f\u6700\u65b0\u7684\u3002<\/p>\n

Git\u63d0\u4f9b\u4e86\u4ee5\u4e0b\u4e24\u79cd\u65b9\u6cd5\u6765\u67e5\u770b\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\u3002<\/p>\n

\u65b9\u6cd5\u4e00\uff1a\u4f7f\u7528git fetch<\/p>\n

\u4f7f\u7528git fetch\u53ef\u4ee5\u5c06\u8fdc\u7a0b\u7248\u672c\u5e93\u4e2d\u7684\u6700\u65b0\u4ee3\u7801\u66f4\u65b0\u5230\u672c\u5730\u3002\u5728\u66f4\u65b0\u4e4b\u540e\uff0c\u53ef\u4ee5\u4f7f\u7528git diff\u547d\u4ee4\u6765\u67e5\u770b\u672c\u5730\u5e93\u4e2d\u7684\u4ee3\u7801\u548c\u6700\u65b0\u4ee3\u7801\u7684\u5dee\u5f02\uff0c\u4ece\u800c\u5224\u65ad\u672c\u5730\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\u3002<\/p>\n

\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a<\/p>\n

\u9996\u5148\uff0c\u5728\u9879\u76ee\u6839\u76ee\u5f55\u4e0b\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u6765\u6293\u53d6\u6700\u65b0\u7684\u4ee3\u7801\uff1a<\/p>\n

$ git fetch<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u6267\u884c\u5b8c\u6210\u540e\uff0c\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u6765\u67e5\u770b\u5f53\u524d\u5206\u652f\u4e0b\u7684\u672c\u5730\u4ee3\u7801\u548c\u8fdc\u7a0b\u6700\u65b0\u4ee3\u7801\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a<\/p>\n
$ git diff HEAD origin\/branch-name<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5176\u4e2d\uff0cbranch-name\u662f\u8981\u67e5\u770b\u7684\u5206\u652f\u540d\u79f0\uff0cHEAD\u8868\u793a\u5f53\u524d\u6700\u65b0\u7684\u672c\u5730\u4ee3\u7801\u3002<\/p>\n
\u5982\u679c\u547d\u4ee4\u8f93\u51fa\u4e3a\u7a7a\uff0c\u5219\u8bf4\u660e\u672c\u5730\u4ee3\u7801\u5df2\u7ecf\u662f\u6700\u65b0\u7684\uff0c\u5426\u5219\u5c31\u8bf4\u660e\u672c\u5730\u4ee3\u7801\u9700\u8981\u66f4\u65b0\u3002<\/p>\n
\u65b9\u6cd5\u4e8c\uff1a\u4f7f\u7528git pull<\/p>\n
\u4e0d\u540c\u4e8egit fetch\uff0cgit pull\u4e0d\u4ec5\u4f1a\u4ece\u8fdc\u7a0b\u7248\u672c\u5e93\u4e2d\u62c9\u53d6\u6700\u65b0\u4ee3\u7801\uff0c\u8fd8\u4f1a\u81ea\u52a8\u5408\u5e76\u5230\u672c\u5730\u4ee3\u7801\u4e2d\u3002\u4f7f\u7528git pull\u4e5f\u53ef\u4ee5\u5224\u65ad\u5f53\u524d\u672c\u5730\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\u3002<\/p>\n
\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a<\/p>\n
\u5728\u9879\u76ee\u6839\u76ee\u5f55\u4e0b\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff0c\u4ece\u8fdc\u7a0b\u7248\u672c\u5e93\u4e2d\u76f4\u63a5\u62c9\u53d6\u6700\u65b0\u4ee3\u7801\u5e76\u81ea\u52a8\u5408\u5e76\u5230\u672c\u5730\uff1a<\/p>\n
$ git pull<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u4e0egit fetch\u4e00\u6837\uff0c\u5728\u66f4\u65b0\u4e4b\u540e\uff0c\u53ef\u4ee5\u4f7f\u7528git diff\u547d\u4ee4\u6765\u67e5\u770b\u672c\u5730\u5e93\u4e2d\u7684\u4ee3\u7801\u548c\u6700\u65b0\u4ee3\u7801\u7684\u5dee\u5f02\uff0c\u4ece\u800c\u5224\u65ad\u672c\u5730\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\u3002<\/p>\n
\u603b\u7ed3<\/p>\n
\u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u9700\u8981\u6ce8\u610f\u4ee3\u7801\u7684\u7248\u672c\u7ba1\u7406\u548c\u534f\u4f5c\u3002\u4f7f\u7528Git\u53ef\u4ee5\u6709\u6548\u5730\u7ba1\u7406\u4ee3\u7801\u7248\u672c\uff0c\u540c\u65f6\u4e5f\u80fd\u65b9\u4fbf\u5730\u4e0e\u5176\u4ed6\u5f00\u53d1\u8005\u8fdb\u884c\u534f\u4f5c\u3002\u4f7f\u7528git fetch\u6216git pull\u547d\u4ee4\u53ef\u4ee5\u5224\u65ad\u672c\u5730\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\uff0c\u65b9\u4fbf\u56e2\u961f\u534f\u4f5c\u548c\u7248\u672c\u63a7\u5236\u3002<\/p>\n
\u9605\u8bfb\u672c\u6587\u540e\uff0c\u4f60\u662f\u5426\u61c2\u5f97\u4e86\u4f7f\u7528Git\u67e5\u770b\u7248\u672c\u662f\u5426\u662f\u6700\u65b0\u7684\uff1f\u5982\u679c\u4f60\u60f3\u6df1\u5165\u4e86\u89e3Git\u7684\u66f4\u591a\u7528\u6cd5\uff0c\u53ef\u4ee5\u53c2\u8003\u76f8\u5173\u6587\u6863\u6216\u4e66\u7c4d\uff0c\u5c06Git\u719f\u7ec3\u638c\u63e1\uff0c\u4ece\u800c\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\u7248\u672c\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662fgit\u600e\u4e48\u67e5\u770b\u7248\u672c\u662f\u4e0d\u662f\u6700\u65b0\u7684\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":"
\u968f\u7740\u8f6f\u4ef6\u5f00\u53d1\u7684\u65e5\u76ca\u590d\u6742\u548c\u56e2\u961f\u534f\u4f5c\u7684\u52a0\u6df1\uff0c\u4ee3\u7801\u7ba1\u7406\u548c\u7248\u672c\u63a7\u5236\u53d8\u5f97\u6108\u53d1\u91cd\u8981\u3002git\u4f5c\u4e3a\u76ee\u524d\u5e7f\u6cdb\u4f7f\u7528\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u53ef\u4ee5\u5e2e\u52a9\u56e2\u961f\u9ad8\u6548\u534f\u4f5c\u3001\u7ba1\u7406\u4ee3\u7801\u5e76\u8ffd\u8e2a\u7248\u672c\u3002\u4f46\u662f\u5728\u65e5\u5e38\u5f00\u53d1\u4e2d\uff0c\u53ef\u80fd\u4f1a\u9047\u5230\u67e5\u770b\u5f53\u524d\u7248\u672c\u662f\u5426\u662f\u6700\u65b0\u7684\u95ee\u9898\u3002\u90a3\u4e48\uff0c\u5982\u4f55\u4f7f\u7528git\u67e5\u770b\u7248\u672c\u662f\u5426\u662f\u6700\u65b0\u7684\u5462\uff1f Git\u662f\u4e00\u6b3e\u5206\u5e03\u5f0f\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u6bcf\u4e2a\u5f00\u53d1\u8005\u90fd\u53ef\u4ee5\u62e5\u6709\u81ea\u5df1\u7684\u672c\u5730\u7248\u672c\u5e93\u3002\u5728\u4ee3\u7801\u66f4\u65b0\u65f6\uff0c\u5f00\u53d1\u8005\u9700\u8981\u5c06\u66f4\u65b0\u63a8\u9001\u5230\u8fdc\u7a0b\u7684\u7248\u672c\u5e93\u4e2d\uff0c\u5176\u4ed6\u5f00\u53d1\u8005\u518d\u4ece\u7248\u672c\u5e93\u4e2d\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002\u8fd9\u5c31\u9700\u8981\u67e5\u770b\u5f53\u524d\u672c\u5730\u4ee3\u7801\u7248\u672c\u662f\u5426\u662f\u6700\u65b0\u7684\u3002 Git\u63d0\u4f9b\u4e86\u4ee5\u4e0b\u4e24\u79cd\u65b9\u6cd5\u6765\u67e5\u770b\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\u3002 \u65b9\u6cd5\u4e00\uff1a\u4f7f\u7528git fetch \u4f7f\u7528git fetch\u53ef\u4ee5\u5c06\u8fdc\u7a0b\u7248\u672c\u5e93\u4e2d\u7684\u6700\u65b0\u4ee3\u7801\u66f4\u65b0\u5230\u672c\u5730\u3002\u5728\u66f4\u65b0\u4e4b\u540e\uff0c\u53ef\u4ee5\u4f7f\u7528git diff\u547d\u4ee4\u6765\u67e5\u770b\u672c\u5730\u5e93\u4e2d\u7684\u4ee3\u7801\u548c\u6700\u65b0\u4ee3\u7801\u7684\u5dee\u5f02\uff0c\u4ece\u800c\u5224\u65ad\u672c\u5730\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\u3002 \u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a \u9996\u5148\uff0c\u5728\u9879\u76ee\u6839\u76ee\u5f55\u4e0b\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u6765\u6293\u53d6\u6700\u65b0\u7684\u4ee3\u7801\uff1a $ git fetch \u767b\u5f55\u540e\u590d\u5236 \u6267\u884c\u5b8c\u6210\u540e\uff0c\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u6765\u67e5\u770b\u5f53\u524d\u5206\u652f\u4e0b\u7684\u672c\u5730\u4ee3\u7801\u548c\u8fdc\u7a0b\u6700\u65b0\u4ee3\u7801\u4e4b\u95f4\u7684\u5dee\u5f02\uff1a $ git diff HEAD origin\/branch-name \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0cbranch-name\u662f\u8981\u67e5\u770b\u7684\u5206\u652f\u540d\u79f0\uff0cHEAD\u8868\u793a\u5f53\u524d\u6700\u65b0\u7684\u672c\u5730\u4ee3\u7801\u3002 \u5982\u679c\u547d\u4ee4\u8f93\u51fa\u4e3a\u7a7a\uff0c\u5219\u8bf4\u660e\u672c\u5730\u4ee3\u7801\u5df2\u7ecf\u662f\u6700\u65b0\u7684\uff0c\u5426\u5219\u5c31\u8bf4\u660e\u672c\u5730\u4ee3\u7801\u9700\u8981\u66f4\u65b0\u3002 \u65b9\u6cd5\u4e8c\uff1a\u4f7f\u7528git pull \u4e0d\u540c\u4e8egit fetch\uff0cgit pull\u4e0d\u4ec5\u4f1a\u4ece\u8fdc\u7a0b\u7248\u672c\u5e93\u4e2d\u62c9\u53d6\u6700\u65b0\u4ee3\u7801\uff0c\u8fd8\u4f1a\u81ea\u52a8\u5408\u5e76\u5230\u672c\u5730\u4ee3\u7801\u4e2d\u3002\u4f7f\u7528git pull\u4e5f\u53ef\u4ee5\u5224\u65ad\u5f53\u524d\u672c\u5730\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\u3002 \u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a \u5728\u9879\u76ee\u6839\u76ee\u5f55\u4e0b\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff0c\u4ece\u8fdc\u7a0b\u7248\u672c\u5e93\u4e2d\u76f4\u63a5\u62c9\u53d6\u6700\u65b0\u4ee3\u7801\u5e76\u81ea\u52a8\u5408\u5e76\u5230\u672c\u5730\uff1a $ git pull \u767b\u5f55\u540e\u590d\u5236 \u4e0egit fetch\u4e00\u6837\uff0c\u5728\u66f4\u65b0\u4e4b\u540e\uff0c\u53ef\u4ee5\u4f7f\u7528git diff\u547d\u4ee4\u6765\u67e5\u770b\u672c\u5730\u5e93\u4e2d\u7684\u4ee3\u7801\u548c\u6700\u65b0\u4ee3\u7801\u7684\u5dee\u5f02\uff0c\u4ece\u800c\u5224\u65ad\u672c\u5730\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\u3002 \u603b\u7ed3 \u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u9700\u8981\u6ce8\u610f\u4ee3\u7801\u7684\u7248\u672c\u7ba1\u7406\u548c\u534f\u4f5c\u3002\u4f7f\u7528Git\u53ef\u4ee5\u6709\u6548\u5730\u7ba1\u7406\u4ee3\u7801\u7248\u672c\uff0c\u540c\u65f6\u4e5f\u80fd\u65b9\u4fbf\u5730\u4e0e\u5176\u4ed6\u5f00\u53d1\u8005\u8fdb\u884c\u534f\u4f5c\u3002\u4f7f\u7528git fetch\u6216git pull\u547d\u4ee4\u53ef\u4ee5\u5224\u65ad\u672c\u5730\u4ee3\u7801\u662f\u5426\u662f\u6700\u65b0\u7684\uff0c\u65b9\u4fbf\u56e2\u961f\u534f\u4f5c\u548c\u7248\u672c\u63a7\u5236\u3002 \u9605\u8bfb\u672c\u6587\u540e\uff0c\u4f60\u662f\u5426\u61c2\u5f97\u4e86\u4f7f\u7528Git\u67e5\u770b\u7248\u672c\u662f\u5426\u662f\u6700\u65b0\u7684\uff1f\u5982\u679c\u4f60\u60f3\u6df1\u5165\u4e86\u89e3Git\u7684\u66f4\u591a\u7528\u6cd5\uff0c\u53ef\u4ee5\u53c2\u8003\u76f8\u5173\u6587\u6863\u6216\u4e66\u7c4d\uff0c\u5c06Git\u719f\u7ec3\u638c\u63e1\uff0c\u4ece\u800c\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\u7248\u672c\u3002 \u4ee5\u4e0a\u5c31\u662fgit\u600e\u4e48\u67e5\u770b\u7248\u672c\u662f\u4e0d\u662f\u6700\u65b0\u7684\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/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-19921","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19921","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=19921"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19921\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19921"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19921"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19921"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}