{"id":2322,"date":"2015-10-09T17:05:03","date_gmt":"2015-10-09T08:05:03","guid":{"rendered":"http:\/\/blog.rutake.com\/techmemo\/?p=2322"},"modified":"2015-10-09T17:07:51","modified_gmt":"2015-10-09T08:07:51","slug":"%e6%94%b9%e8%a1%8c%e3%82%b3%e3%83%bc%e3%83%89%e3%81%ab%e3%81%be%e3%81%a4%e3%82%8f%e3%82%8blinux%e3%82%b3%e3%83%9e%e3%83%b3%e3%83%89-diff%e3%81%a7%e6%94%b9%e8%a1%8c%e3%82%92%e7%84%a1%e8%a6%96%e3%80%81c","status":"publish","type":"post","link":"https:\/\/blog.rutake.com\/techmemo\/2015\/10\/09\/%e6%94%b9%e8%a1%8c%e3%82%b3%e3%83%bc%e3%83%89%e3%81%ab%e3%81%be%e3%81%a4%e3%82%8f%e3%82%8blinux%e3%82%b3%e3%83%9e%e3%83%b3%e3%83%89-diff%e3%81%a7%e6%94%b9%e8%a1%8c%e3%82%92%e7%84%a1%e8%a6%96%e3%80%81c\/","title":{"rendered":"\u6539\u884c\u30b3\u30fc\u30c9\u306b\u307e\u3064\u308f\u308bLinux\u30b3\u30de\u30f3\u30c9 diff\u3067\u6539\u884c\u3092\u7121\u8996\u3001cat\u3067\u6539\u884c\u30b3\u30fc\u30c9\u78ba\u8a8d"},"content":{"rendered":"

diff\u3092\u5b9f\u884c\u3059\u308b\u3068\u6539\u884c\u30b3\u30fc\u30c9\u3060\u3051\u306e\u9055\u3044\u306a\u306e\u306b\u5168\u90e8\u9055\u3046\u884c\u3068\u3057\u3066\u4e01\u5be7\u306b\u51fa\u3057\u3066\u304f\u308c\u308b\u3002<\/p>\n

\u6539\u884c\u30b3\u30fc\u30c9\u306e\u307f\u306e\u9055\u3044\u3092\u7121\u8996\u3057\u305f\u3044\u5834\u5408\u306f\u4ee5\u4e0b\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u3066diff\u3092\u5b9f\u884c\u3059\u308b\u3002
\n[shell]
\ndiff –strip-trailing-cr fileA fileB
\n[\/shell]<\/p>\n

\u305d\u3082\u305d\u3082\u6539\u884c\u30b3\u30fc\u30c9\u304c\u4e0d\u305e\u308d\u3044\u306a\u306e\u304c\u554f\u984c\u306a\u306e\u3067\u3001\u307e\u305a\u306f\u6539\u884c\u30b3\u30fc\u30c9\u3092\u78ba\u8a8d\u3059\u308b\u305f\u3081\u306b\u306fcat -A\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u3064\u3051\u308b
\n[shell]
\ncat -A \u30d5\u30a1\u30a4\u30eb\u540d
\n<\/match>^M$ \/\/ CRLF
\n<\/match>$ \/\/ LF
\n[\/shell]<\/p>\n

\u6539\u884c\u30b3\u30fc\u30c9\u3092\u5909\u63db\u3059\u308b\u306b\u306fdos2unix,unix2dos\u304c\u3042\u308c\u3070\u305d\u308c\u3092\u4f7f\u3046\u304c\u3001vim\u3067\u3067\u304d\u308b<\/p>\n

[shell]
\n\/\/CRLF
\n:set fileformat=dos
\n\/\/LF
\n:set fileformat=unix
\n[\/shell]<\/p>\n","protected":false},"excerpt":{"rendered":"

diff\u3092\u5b9f\u884c\u3059\u308b\u3068\u6539\u884c\u30b3\u30fc\u30c9\u3060\u3051\u306e\u9055\u3044\u306a\u306e\u306b\u5168\u90e8\u9055\u3046\u884c\u3068\u3057\u3066\u4e01\u5be7\u306b\u51fa\u3057\u3066\u304f\u308c\u308b … \u7d9a\u304d\u3092\u8aad\u3080 →<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[11,33],"tags":[],"_links":{"self":[{"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/posts\/2322"}],"collection":[{"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/comments?post=2322"}],"version-history":[{"count":4,"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/posts\/2322\/revisions"}],"predecessor-version":[{"id":2326,"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/posts\/2322\/revisions\/2326"}],"wp:attachment":[{"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/media?parent=2322"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/categories?post=2322"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.rutake.com\/techmemo\/wp-json\/wp\/v2\/tags?post=2322"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}