{"id":2715,"date":"2018-09-16T02:51:34","date_gmt":"2018-09-15T17:51:34","guid":{"rendered":"https:\/\/www.chihayafuru.jp\/tech\/?p=2715"},"modified":"2023-07-27T13:49:39","modified_gmt":"2023-07-27T04:49:39","slug":"git-diff%e3%81%ae%e6%96%87%e5%ad%97%e3%82%b3%e3%83%bc%e3%83%89%e5%af%be%e5%bf%9c","status":"publish","type":"post","link":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/archives\/2715","title":{"rendered":"[git] diff\u306e\u6587\u5b57\u30b3\u30fc\u30c9\u5bfe\u5fdc"},"content":{"rendered":"<p>\u30b7\u30b9\u30c6\u30e0\u3068\u7570\u306a\u308b\u6587\u5b57\u30b3\u30fc\u30c9\uff08\u305f\u3068\u3048\u3070Shift-JIS\uff09\u3067\u30a8\u30f3\u30b3\u30fc\u30c9\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306ediff\u306b\u304a\u3051\u308b\u6587\u5b57\u5316\u3051\u3092\u89e3\u6d88\u3059\u308b<\/p>\n<h2>1. \u62e1\u5f35\u5b50\u3067\u6587\u5b57\u30b3\u30fc\u30c9\u5909\u63db\u3092\u9069\u7528\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a<\/h2>\n<p><code>.gitattributes<\/code>\u306b\u5c5e\u6027\u3092\u8a18\u8ff0\u3059\u308b<\/p>\n<h3>1.1. \u5c5e\u6027\u6307\u5b9a\u306e\u4f8b<\/h3>\n<pre class=\"lang:default highlight:0 decode:true \" >*.c diff=sjis\r\n*.h diff=sjis<\/pre>\n<p><!--more--><\/p>\n<pre class=\"lang:default highlight:0 decode:true \" >*.c diff=cp932\r\n*.h diff=cp932<\/pre>\n<p><!--more--><\/p>\n<p>&nbsp;<\/p>\n<h2>2. diff\u5b9f\u884c\u524d\u306e\u30b3\u30de\u30f3\u30c9\u3092\u8a2d\u5b9a<\/h2>\n<h3>2.1. config\u30b3\u30de\u30f3\u30c9\u306e\u4f8b<\/h3>\n<pre class=\"lang:default highlight:0 decode:true \" >$ git config diff.sjis.textconv \"iconv -f sjis -t UTF-8\"<\/pre>\n<pre class=\"lang:default highlight:0 decode:true \" >$ git config diff.cp932.textconv \"iconv -f CP932 -t UTF-8\"<\/pre>\n<p>&nbsp;<\/p>\n<h3>2.2. .gitconfig\u306e\u4f8b<\/h3>\n<pre class=\"lang:default highlight:0 decode:true \" >[diff \"sjis\"]\r\n        textconv = iconv -f sjis -t UTF-8<\/pre>\n<pre class=\"lang:default highlight:0 decode:true \" >[diff \"cp932\"]\r\n        textconv = iconv -f CP932 -t UTF-8<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u30b7\u30b9\u30c6\u30e0\u3068\u7570\u306a\u308b\u6587\u5b57\u30b3\u30fc\u30c9\uff08\u305f\u3068\u3048\u3070Shift-JIS\uff09\u3067\u30a8\u30f3\u30b3\u30fc\u30c9\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306ediff\u306b\u304a\u3051\u308b\u6587\u5b57\u5316\u3051\u3092\u89e3\u6d88\u3059\u308b 1. \u62e1\u5f35\u5b50\u3067\u6587\u5b57\u30b3\u30fc\u30c9\u5909\u63db\u3092\u9069\u7528\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a .gitattributes\u306b\u5c5e\u6027\u3092\u8a18\u8ff0\u3059\u308b  [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[2,120],"class_list":["post-2715","post","type-post","status-publish","format-standard","hentry","category-memo","tag-git","tag-japanese"],"_links":{"self":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/2715","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/comments?post=2715"}],"version-history":[{"count":12,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/2715\/revisions"}],"predecessor-version":[{"id":6333,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/2715\/revisions\/6333"}],"wp:attachment":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/media?parent=2715"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/categories?post=2715"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/tags?post=2715"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}