{"id":25741,"date":"2014-12-08T12:04:32","date_gmt":"2014-12-08T03:04:32","guid":{"rendered":"http:\/\/www.softantenna.com\/wp\/?p=25741"},"modified":"2014-12-08T12:04:32","modified_gmt":"2014-12-08T03:04:32","slug":"icdiff","status":"publish","type":"post","link":"https:\/\/softantenna.com\/blog\/icdiff\/","title":{"rendered":"\u5909\u66f4\u70b9\u3092\u6a2a\u306b\u4e26\u3079\u3066\u898b\u3084\u3059\u304f\u8868\u793a\u3067\u304d\u308b\u65b0\u4e16\u4ee3diff\u30c4\u30fc\u30eb\u300cicdiff\u300d"},"content":{"rendered":"

\"Icdiff<\/p>\n

\u53e4\u304f\u304b\u3089\u4f7f\u308f\u308c\u3066\u3044\u308bdiff\u30c4\u30fc\u30eb\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u7b87\u6240\u3092\u6b63\u78ba\u306b\u77e5\u308b\u305f\u3081\u306e\u60c5\u5831\u3092\u51fa\u529b\u3057\u3066\u304f\u308c\u308b\u306e\u3067\u3001\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u958b\u767a\u306b\u6b20\u304b\u3059\u3053\u3068\u304c\u3067\u304d\u306a\u3044\u30c4\u30fc\u30eb\u3068\u3044\u3048\u308b\u3067\u3057\u3087\u3046\u3002\u3057\u304b\u3057\u305d\u306e\u8868\u793a\u306f\u3069\u3061\u3089\u304b\u3068\u3044\u3048\u3070\u6a5f\u68b0\u5411\u3051\u3067\u3001\u4eba\u9593\u304c\u76f4\u611f\u7684\u306b\u5909\u66f4\u70b9\u3092\u77e5\u308b\u305f\u3081\u306b\u306f\u5411\u3044\u3066\u3044\u306a\u3044\u306e\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002<\/p>\n

\u305d\u306e\u6b20\u70b9\u3092\u88dc\u3046\u305f\u3081\u306b\u958b\u767a\u3055\u308c\u305f\u65b0\u4e16\u4ee3\u306ediff\u30c4\u30fc\u30eb\u304c\u300cicdiff<\/a>\u300d\u3067\u3059\u3002\u5909\u66f4\u524d\/\u5909\u66f4\u5f8c\u306e\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u6a2a\u306b\u4e26\u3079\u3001\u304b\u3064\u5909\u66f4\u7b87\u6240\u3092\u30cf\u30a4\u30e9\u30a4\u30c8\u8868\u793a\u3057\u3066\u304f\u308c\u307e\u3059(\u4e0a\u306e\u56f3\u306e\u3088\u3046\u306b)\u3002<\/p>\n

diff\u3092\u7f6e\u304d\u63db\u3048\u308b\u3082\u306e\u3067\u306f\u306a\u304f\u3001\u88dc\u52a9\u3059\u308b\u5dee\u5206\u30c4\u30fc\u30eb\u3068\u3057\u3066\u4fbf\u5229\u306b\u4f7f\u3048\u305d\u3046\u3067\u3059\u3002<\/p>\n

<\/p>\n

\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb<\/h3>\n

Mac OS X \/ Linux\u7528\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65b9\u6cd5\u306f\u4ee5\u4e0b\u306e\u901a\u308a\u3002<\/p>\n

\ncurl -s https:\/\/raw.githubusercontent.com\/jeffkaufman\/icdiff\/master\/icdiff \\\n  | sudo tee \/usr\/local\/bin\/icdiff > \/dev\/null \\\n  && sudo chmod ugo+rx \/usr\/local\/bin\/icdiff\n<\/pre>\n
rehash\u3059\u308b\u3068\u5b9f\u884c\u53ef\u80fd\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n
\"Zsh\"<\/p>\n
\u30bf\u30fc\u30df\u30ca\u30eb\u304b\u3089\u300cicdiff \u5909\u66f4\u524d\u30d5\u30a1\u30a4\u30eb \u5909\u66f4\u5f8c\u30d5\u30a1\u30a4\u30eb2\u300d\u3068\u5b9f\u884c\u3057\u3066\u307f\u307e\u3057\u305f\u3002\u5909\u66f4\u524d\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u524a\u9664\u3055\u308c\u305f\u7b87\u6240\u306f\u8d64\u3044\u6587\u5b57\u3067\u3001\u5909\u66f4\u5f8c\u30d5\u30a1\u30a4\u30eb\u306b\u8ffd\u52a0\u4fee\u6b63\u3055\u308c\u305f\u7b87\u6240\u306f\u7dd1\u306e\u6587\u5b57\u3067\u8868\u793a\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u304c\u308f\u304b\u308a\u307e\u3059\u3002<\/p>\n
\u666e\u901a\u306ediff\u3088\u308a\u304b\u306a\u308a\u5206\u304b\u308a\u3084\u3059\u304f\u8868\u793a\u3055\u308c\u3066\u307e\u3059\u306d\uff01<\/p>\n
git\u3068\u7d44\u307f\u5408\u308f\u305b\u308b\u3053\u3068\u3082<\/h3>\n
GitHub<\/a>\u3067\u306fgit\u3068\u7d44\u5408\u305b\u3066\u4f7f\u7528\u3059\u308b\u65b9\u6cd5\u3082\u8aac\u660e\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4ee5\u4e0b\u306e\u3088\u3046\u306bextcmd\u3067\u6307\u5b9a\u3059\u308b\u304b\u3001<\/p>\n
\n    git difftool --extcmd icdiff\n<\/pre>\n
\u300cgit-icdiff\u300d(\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u542b\u307e\u308c\u3066\u3044\u307e\u3059)\u3092\u30d1\u30b9\u306b\u30b3\u30d4\u30fc\u3066\u3001<\/p>\n
\n\tgit icdiff\n<\/pre>\n
\u3068\u5b9f\u884c\u3057\u307e\u3059\u3002<\/p>\n
\u3088\u308a\u3088\u308a\u5dee\u5206\u8868\u793a\u3092\u6c42\u3081\u3066\u3044\u308b\u65b9\u306f\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
\u53e4\u304f\u304b\u3089\u4f7f\u308f\u308c\u3066\u3044\u308bdiff\u30c4\u30fc\u30eb\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u7b87\u6240\u3092\u6b63\u78ba\u306b\u77e5\u308b\u305f\u3081\u306e\u60c5\u5831\u3092\u51fa\u529b\u3057\u3066\u304f\u308c\u308b\u306e\u3067\u3001\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u958b\u767a\u306b\u6b20\u304b\u3059\u3053\u3068\u304c\u3067\u304d\u306a\u3044\u30c4\u30fc\u30eb\u3068\u3044\u3048\u308b\u3067\u3057\u3087\u3046\u3002\u3057\u304b\u3057\u305d\u306e\u8868\u793a\u306f\u3069\u3061\u3089\u304b\u3068\u3044\u3048\u3070\u6a5f\u68b0\u5411\u3051\u3067\u3001\u4eba\u9593\u304c\u76f4\u611f\u7684\u306b […]<\/p>\n","protected":false},"author":2,"featured_media":25739,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"swell_btn_cv_data":"","footnotes":""},"categories":[75],"tags":[62],"class_list":["post-25741","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-software","tag-diff"],"_links":{"self":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/posts\/25741","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/comments?post=25741"}],"version-history":[{"count":0,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/posts\/25741\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/media\/25739"}],"wp:attachment":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/media?parent=25741"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/categories?post=25741"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/tags?post=25741"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}