{"id":37497,"date":"2023-09-20T08:01:20","date_gmt":"2023-10-17T15:39:09","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/"},"modified":"2024-05-04T00:38:38","modified_gmt":"2024-05-03T16:38:38","slug":"git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/","title":{"rendered":"git\u7684\u4f7f\u7528\u65b9\u6cd5"},"content":{"rendered":"<p>\u547d\u4ee4\u96c6<br \/>\n\u83b7\u53d6\u548c\u62c9\u53d6<br \/>\n\u5dee\u5f02<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">pull = fetch + merge origin\/master<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">\u30ed\u30fc\u30ab\u30eb\u306e\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u7d50\u3073\u4ed8\u3044\u3066\u3044\u308b\u306e\u304cmaster\u30d6\u30e9\u30f3\u30c1<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">origin\/master\u3068\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u7d50\u3073\u3064\u3044\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1<\/ul>\n<h2>git diff\u53ef\u4ee5\u8fdb\u884c\u4ee3\u7801\u6bd4\u8f83\u3002<\/h2>\n<div>\n<div class=\"post-table\">\u7528\u6cd5\u30b3\u30de\u30f3\u30c9\u89e3\u8aacgit diff \u5909\u66f4\u524d..\u5909\u66f4\u5f8c<br \/>\n^ \u4e00\u3064\u524d<br \/>\n\u30ea\u30e2\u30fc\u30c8\u540d:origin \u30d6\u30e9\u30f3\u30c1:mastergit pull \u3059\u308b\u524d\u306b\u30ea\u30e2\u30fc\u30c8\u3068\u306e\u5909\u66f4\u70b9git diff HEAD..\u30ea\u30e2\u30fc\u30c8\u540d\/\u30d6\u30e9\u30f3\u30c1git push \u3059\u308b\u524d\u306b\u30ea\u30e2\u30fc\u30c8\u3068\u306e\u5909\u66f4\u70b9git diff \u30ea\u30e2\u30fc\u30c8\u540d\/\u30d6\u30e9\u30f3\u30c1\u540d..HEADgit add \u3059\u308b\u524d\u306b\u5909\u66f4\u70b9git diffgit add \u3057\u305f\u5f8c\u306b\u5909\u66f4\u70b9\u3092\u898b\u308bgit diff &#8211;cached\u4eca\u56de\u30b3\u30df\u30c3\u30c8\u3057\u305f\u5909\u66f4\u70b9git diff HEAD^..HEAD\u30b3\u30df\u30c3\u30c8\u540c\u58eb\u3092\u6bd4\u8f03git diff \u5909\u66f4\u524d\u306eSHA..\u5909\u66f4\u5f8c\u306eSHA\u3042\u308b\u30b3\u30df\u30c3\u30c8\u306e\u5909\u66f4\u70b9git diff \u30b3\u30df\u30c3\u30c8\u306eSHA^..\u30b3\u30df\u30c3\u30c8\u306eSHA\u30d6\u30e9\u30f3\u30c1\u540c\u58eb\u3092\u6bd4\u8f03git diff \u30d6\u30e9\u30f3\u30c1A..\u30d6\u30e9\u30f3\u30c1B\u3042\u308b1\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u70b9git diff &#8212; \u5bfe\u8c61\u306e\u30d5\u30a1\u30a4\u30eb\u30d1\u30b9\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u30d6\u30e9\u30f3\u30c1\u9593\u306e\u5909\u66f4\u70b9git diff \u30d6\u30e9\u30f3\u30c1A..\u30d6\u30e9\u30f3\u30c1B &#8212; \u5bfe\u8c61\u306e\u30d5\u30a1\u30a4\u30eb\u30d1\u30b9\u5225\u30d5\u30a1\u30a4\u30eb\u540c\u58eb\u3092\u6bd4\u8f03git diff &#8212; \u30d5\u30a1\u30a4\u30eb\u30d1\u30b9A \u30d5\u30a1\u30a4\u30eb\u30d1\u30b9B\u30b5\u30de\u30eagit diff &#8211;stat\u30d5\u30a1\u30a4\u30eb\u540dgit diff &#8211;name-only\u5358\u8a9e\u5358\u4f4d\u3067\u6bd4\u8f03git diff &#8211;color-wordsExcel \u306e\u4e2d\u8eab\u3092\u6bd4\u8f03git diff &#8211;color-words &#8212; \u5bfe\u8c61\u306eExcel\u4e0a\u65b9\u5411\u306b\u6bd4\u8f03\u5dee\u5206git diff &#8211;compaction-heuristic<\/div>\n<\/div>\n<h2>git\u548c\u5176\u4ed6\u8a2d\u5b9a<\/h2>\n<h3>\u8bbe\u7f6e\u7528\u6237\u4fe1\u606f (Set user information)<\/h3>\n<pre class=\"post-pre\"><code>git config --global user.name \"First-name Family-name\"\r\ngit config --global user.email \"username@example.com\"\r\n<\/code><\/pre>\n<h3>\u989c\u8272<\/h3>\n<pre class=\"post-pre\"><code>git config --global color.diff auto\r\ngit config --global color.status auto\r\ngit config --global color.branch auto\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u547d\u4ee4\u96c6 \u83b7\u53d6\u548c\u62c9\u53d6 \u5dee\u5f02 pull = fetch + merge origin\/master &nbsp;  [&hellip;]<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37497","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>git\u7684\u4f7f\u7528\u65b9\u6cd5 - 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\/git\u7684\u4f7f\u7528\u65b9\u6cd5-5\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"git\u7684\u4f7f\u7528\u65b9\u6cd5\" \/>\n<meta property=\"og:description\" content=\"\u547d\u4ee4\u96c6 \u83b7\u53d6\u548c\u62c9\u53d6 \u5dee\u5f02 pull = fetch + merge origin\/master &nbsp; [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u4f7f\u7528\u65b9\u6cd5-5\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-10-17T15:39:09+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-03T16:38:38+00:00\" \/>\n<meta name=\"author\" content=\"\u97f5, \u79d1\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u97f5, \u79d1\" \/>\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\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/\",\"name\":\"git\u7684\u4f7f\u7528\u65b9\u6cd5 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-10-17T15:39:09+00:00\",\"dateModified\":\"2024-05-03T16:38:38+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"git\u7684\u4f7f\u7528\u65b9\u6cd5\"}]},{\"@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\/6530331a63adef3b3443a1fab53a0e6e\",\"name\":\"\u97f5, \u79d1\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g\",\"caption\":\"\u97f5, \u79d1\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunke\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"git\u7684\u4f7f\u7528\u65b9\u6cd5 - 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\/git\u7684\u4f7f\u7528\u65b9\u6cd5-5\/","og_locale":"zh_CN","og_type":"article","og_title":"git\u7684\u4f7f\u7528\u65b9\u6cd5","og_description":"\u547d\u4ee4\u96c6 \u83b7\u53d6\u548c\u62c9\u53d6 \u5dee\u5f02 pull = fetch + merge origin\/master &nbsp; [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u4f7f\u7528\u65b9\u6cd5-5\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-10-17T15:39:09+00:00","article_modified_time":"2024-05-03T16:38:38+00:00","author":"\u97f5, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u97f5, \u79d1","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/","name":"git\u7684\u4f7f\u7528\u65b9\u6cd5 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-10-17T15:39:09+00:00","dateModified":"2024-05-03T16:38:38+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"git\u7684\u4f7f\u7528\u65b9\u6cd5"}]},{"@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\/6530331a63adef3b3443a1fab53a0e6e","name":"\u97f5, \u79d1","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g","caption":"\u97f5, \u79d1"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunke\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-5\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37497","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\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37497"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37497\/revisions"}],"predecessor-version":[{"id":95064,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37497\/revisions\/95064"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37497"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37497"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37497"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}