{"id":37448,"date":"2022-11-16T01:09:49","date_gmt":"2022-12-24T17:34:41","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/"},"modified":"2024-04-29T00:51:16","modified_gmt":"2024-04-28T16:51:16","slug":"%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/","title":{"rendered":"\u5173\u4e8egit\u7684\u5dee\u5f02"},"content":{"rendered":"<p>\u6211\u4e4b\u524d\u4e00\u76f4\u4f7f\u7528svn\u6765\u7ba1\u7406\u7a0b\u5e8f\uff0c\u4f46\u662f\u5f53\u6211\u5f00\u59cb\u5f00\u53d1\u548c\u9a8c\u8bc1\u65f6\uff0c\u6211\u53d1\u73b0\u4f7f\u7528git\u6765\u7ba1\u7406\u9a8c\u8bc1\u9636\u6bb5\u7684\u6587\u4ef6\u4ee5\u53ca\u56de\u5230\u5148\u524d\u7684\u73af\u5883\u975e\u5e38\u65b9\u4fbf\u3002\u6211\u60f3\u603b\u7ed3\u4e00\u4e0b\u6211\u5bf9git diff\u786e\u8ba4\u7684\u4f7f\u7528\u4f53\u9a8c\u3002<\/p>\n<h1>git\u7684\u6539\u52a8\u5bf9\u6bd4<\/h1>\n<p>\u7531\u4e8egit diff\u547d\u4ee4\u53ef\u4ee5\u5728\u4e0a\u4e0b\u65b9\u5411\u4e0a\u8f93\u51fa\u53d8\u66f4\u524d\u540e\u7684\u5dee\u5f02\uff0c\u56e0\u6b64\u6211\u4eec\u901a\u5e38\u4f7f\u7528git diff\u6765\u786e\u8ba4\u5c0f\u89c4\u6a21\u7684\u53d8\u66f4\u3002<\/p>\n<pre class=\"post-pre\"><code>\/\/ \u30ef\u30fc\u30ad\u30f3\u30b0\u30a8\u30ea\u30a2\u3067\u306e\u6bd4\u8f03\r\n$ git diff\r\n\r\n\/\/ \u30d5\u30a1\u30a4\u30eb\u306e\u307f\r\n$ git diff --name-only\r\n\r\n\/\/ \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u4e0a\u3067\u306e\u6bd4\u8f03\r\n$ git diff --cached\r\n\r\n\/\/ commit\u3057\u305f\u8005\u540c\u58eb\r\n$ git diff \u5909\u66f4\u524d\u306eSHA..\u5909\u66f4\u5f8c\u306eSHA\r\n<\/code><\/pre>\n<h1>git\u7684\u5dee\u5f02\u5de5\u5177<\/h1>\n<p>\u5728git\u4e0a\u8bbe\u5b9a\u9ed8\u8ba4\u4f7f\u7528\u7684\u5dee\u5f02\u5de5\u5177\uff0c\u5e76\u4f7f\u7528\u8be5\u5de5\u5177\u6765\u786e\u8ba4\u5dee\u5f02\u3002\u5dee\u5f02\u5de5\u5177\u7684\u8bbe\u5b9a\u5199\u5728.gitconfig\u6587\u4ef6\u4e2d\u5e76\u8fdb\u884c\u4f7f\u7528\u3002\u56e0\u4e3a\u6211\u4f7f\u7528\u7684\u662fWindows\u7cfb\u7edf\uff0c\u6240\u4ee5\u6211\u4f7f\u7528WinMerge\u4f5c\u4e3a\u5dee\u5f02\u5de5\u5177\u6765\u786e\u8ba4\u5b58\u653e\u5728\u5de5\u4f5c\u533a\u7684\u6587\u4ef6\u3002\u8bbe\u5b9a\u65b9\u6cd5\u5df2\u7ecf\u5728\u8fd9\u7bc7\u6587\u7ae0\u4e2d\u5199\u51fa\u6765\u4e86\u3002<\/p>\n<p>\u4f7f\u7528WinMerge\u53ef\u4ee5\u663e\u793a\u4fee\u6539\u8fc7\u7684\u76ee\u5f55\u548c\u6587\u4ef6\u7684\u5dee\u5f02\uff0c\u5e76\u4e14\u4ee5\u5e76\u6392\u7684\u65b9\u5f0f\u5c55\u793a\u5dee\u5f02\uff0c\u8fd9\u6837\u67e5\u770b\u8d77\u6765\u975e\u5e38\u65b9\u4fbf\u548c\u5b9e\u7528\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git difftool -h\r\nusage: git difftool [&lt;options&gt;] [&lt;commit&gt; [&lt;commit&gt;]] [--] [&lt;path&gt;...]\r\n\r\n    -g, --gui             use `diff.guitool` instead of `diff.tool`\r\n    -d, --dir-diff        perform a full-directory diff\r\n    -y, --no-prompt       do not prompt before launching a diff tool\r\n    --symlinks            use symlinks in dir-diff mode\r\n    -t, --tool &lt;tool&gt;     use the specified diff tool\r\n    --tool-help           print a list of diff tools that may be used with `--tool`\r\n    --trust-exit-code     make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code\r\n    -x, --extcmd &lt;command&gt;\r\n                          specify a custom command for viewing diffs\r\n    --no-index            passed to `diff`\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u6211\u4e4b\u524d\u4e00\u76f4\u4f7f\u7528svn\u6765\u7ba1\u7406\u7a0b\u5e8f\uff0c\u4f46\u662f\u5f53\u6211\u5f00\u59cb\u5f00\u53d1\u548c\u9a8c\u8bc1\u65f6\uff0c\u6211\u53d1\u73b0\u4f7f\u7528git\u6765\u7ba1\u7406\u9a8c\u8bc1\u9636\u6bb5\u7684\u6587\u4ef6\u4ee5\u53ca\u56de\u5230\u5148\u524d\u7684\u73af [&hellip;]<\/p>\n","protected":false},"author":9,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37448","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u5173\u4e8egit\u7684\u5dee\u5f02 - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit\u7684\u5dee\u5f02\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5173\u4e8egit\u7684\u5dee\u5f02\" \/>\n<meta property=\"og:description\" content=\"\u6211\u4e4b\u524d\u4e00\u76f4\u4f7f\u7528svn\u6765\u7ba1\u7406\u7a0b\u5e8f\uff0c\u4f46\u662f\u5f53\u6211\u5f00\u59cb\u5f00\u53d1\u548c\u9a8c\u8bc1\u65f6\uff0c\u6211\u53d1\u73b0\u4f7f\u7528git\u6765\u7ba1\u7406\u9a8c\u8bc1\u9636\u6bb5\u7684\u6587\u4ef6\u4ee5\u53ca\u56de\u5230\u5148\u524d\u7684\u73af [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit\u7684\u5dee\u5f02\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2022-12-24T17:34:41+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-28T16:51:16+00:00\" \/>\n<meta name=\"author\" content=\"\u6e05, \u626c\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6e05, \u626c\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/\",\"name\":\"\u5173\u4e8egit\u7684\u5dee\u5f02 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2022-12-24T17:34:41+00:00\",\"dateModified\":\"2024-04-28T16:51:16+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5173\u4e8egit\u7684\u5dee\u5f02\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461\",\"name\":\"\u6e05, \u626c\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g\",\"caption\":\"\u6e05, \u626c\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyang\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5173\u4e8egit\u7684\u5dee\u5f02 - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit\u7684\u5dee\u5f02\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5173\u4e8egit\u7684\u5dee\u5f02","og_description":"\u6211\u4e4b\u524d\u4e00\u76f4\u4f7f\u7528svn\u6765\u7ba1\u7406\u7a0b\u5e8f\uff0c\u4f46\u662f\u5f53\u6211\u5f00\u59cb\u5f00\u53d1\u548c\u9a8c\u8bc1\u65f6\uff0c\u6211\u53d1\u73b0\u4f7f\u7528git\u6765\u7ba1\u7406\u9a8c\u8bc1\u9636\u6bb5\u7684\u6587\u4ef6\u4ee5\u53ca\u56de\u5230\u5148\u524d\u7684\u73af [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit\u7684\u5dee\u5f02\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2022-12-24T17:34:41+00:00","article_modified_time":"2024-04-28T16:51:16+00:00","author":"\u6e05, \u626c","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6e05, \u626c","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/","name":"\u5173\u4e8egit\u7684\u5dee\u5f02 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2022-12-24T17:34:41+00:00","dateModified":"2024-04-28T16:51:16+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5173\u4e8egit\u7684\u5dee\u5f02"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461","name":"\u6e05, \u626c","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g","caption":"\u6e05, \u626c"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyang\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84%e5%b7%ae%e5%bc%82\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37448","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/9"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37448"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37448\/revisions"}],"predecessor-version":[{"id":69616,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37448\/revisions\/69616"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37448"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37448"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37448"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}