{"id":1118,"date":"2018-09-29T13:20:18","date_gmt":"2018-09-29T04:20:18","guid":{"rendered":"https:\/\/yuis-programming.com\/?p=1118"},"modified":"2021-11-07T09:42:56","modified_gmt":"2021-11-07T00:42:56","slug":"git%e3%81%aediff%e3%81%a7meld%e3%82%92%e4%bd%bf%e7%94%a8%e3%81%99%e3%82%8b%e6%96%b9%e6%b3%95","status":"publish","type":"post","link":"https:\/\/yuis-programming.com\/?p=1118","title":{"rendered":"git\u306ediff\u3067meld\u3092\u4f7f\u7528\u3059\u308b\u65b9\u6cd5"},"content":{"rendered":"<p>git\u306ediff\u3067\u306f\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\u3092\u898b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u304c\u3001\u901a\u5e38\u306ediff\u3060\u3068\u3001\u898b\u308b\u306b\u582a\u3048\u306a\u3044\u8868\u793a\u3067\u3001\u304b\u306a\u308a\u5206\u304b\u308a\u3065\u3089\u3044\u3068\u3044\u3044\u307e\u3059\u304b\u2026\u3002<\/p>\n<p>meld\u3063\u3066\u3044\u3046\u306e\u304c\u7d50\u69cb\u826f\u304b\u3063\u305f\u306a\u3063\u3066\u3044\u3046\u306e\u3092\u601d\u3044\u51fa\u3057\u3066\u3001\u305d\u308c\u3092git diff\u3067\u4f7f\u3048\u306a\u3044\u306e\u304b\u306a\u3068\u8abf\u3079\u305f\u3089\u3069\u3046\u3084\u3089\u4f7f\u3048\u308b\u3088\u3046\u3067\u3059\u3002<\/p>\n<h2>Linux<\/h2>\n<pre><code>git config --global diff.tool meld\n\ngit difftool HEAD~1 .\\header.php\n<\/code><\/pre>\n<p><a href=\"https:\/\/stackoverflow.com\/questions\/2006032\/view-differences-of-branches-with-meld\">git &#8211; View differences of branches with meld? &#8211; Stack Overflow<\/a><\/p>\n<p>\u8a66\u3057\u3066\u306a\u3044\u306e\u3067\u52d5\u304f\u4fdd\u8a3c\u306f\u306a\u3044\u3067\u3059\u3002<\/p>\n<h2>Windows<\/h2>\n<p>Meld.exe\u3092meld.exe\u306b\u30ea\u30cd\u30fc\u30e0\u3057\u3001\u30d5\u30a9\u30eb\u30c0\u3092path\u306b\u901a\u3057\u307e\u3059\u3002<\/p>\n<p>\u305d\u306e\u5f8c\u3001<code>.gitconfig<\/code>\u306b\u4ee5\u4e0b\u3092\u8ffd\u52a0\u3002<\/p>\n<pre><code>[diff]\n  tool = meld\n[difftool \"meld\"]\n  cmd = meld.exe $LOCAL $REMOTE\n<\/code><\/pre>\n<p>\u305d\u3057\u3066\u3001difftool\u304c\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code>git difftool HEAD~1 .\\header.php\n<\/code><\/pre>\n<p><a href=\"https:\/\/stackoverflow.com\/questions\/20238883\/git-diff-and-meld-on-windows\">msysgit &#8211; Git Diff and Meld on Windows &#8211; Stack Overflow<\/a><\/p>\n<p>\u306a\u304a\u3001<code>git difftool HEAD~1 .\\header.php<\/code>\u3068\u3044\u3046\u306e\u306f\u3001<code>git diff HEAD~1 .\\header.php<\/code>\u3068\u540c\u69d8\u3067\u3059\u3002git diff\u306ediff\u3092difftool\u306b\u7f6e\u304d\u63db\u3048\u3066\u3044\u308b\u3068\u3044\u3046\u3060\u3051\u3067\u3059\u3002<code>HEAD~1<\/code>\u306f\u3001\u6700\u65b0\u306ecommit\u306e\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u3068\u6bd4\u3079\u308b\u3068\u3044\u3046\u610f\u5473\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>git\u306ediff\u3067\u306f\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\u3092\u898b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u304c\u3001\u901a\u5e38\u306ediff\u3060\u3068\u3001\u898b\u308b\u306b\u582a\u3048\u306a\u3044\u8868\u793a\u3067\u3001\u304b\u306a\u308a\u5206\u304b [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"spay_email":"","jetpack_publicize_message":"","jetpack_is_tweetstorm":false},"categories":[1],"tags":[],"acf":[],"jetpack_featured_media_url":"","jetpack_publicize_connections":[],"jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/p8Rxwo-i2","_links":{"self":[{"href":"https:\/\/yuis-programming.com\/index.php?rest_route=\/wp\/v2\/posts\/1118"}],"collection":[{"href":"https:\/\/yuis-programming.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/yuis-programming.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/yuis-programming.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/yuis-programming.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1118"}],"version-history":[{"count":3,"href":"https:\/\/yuis-programming.com\/index.php?rest_route=\/wp\/v2\/posts\/1118\/revisions"}],"predecessor-version":[{"id":3347,"href":"https:\/\/yuis-programming.com\/index.php?rest_route=\/wp\/v2\/posts\/1118\/revisions\/3347"}],"wp:attachment":[{"href":"https:\/\/yuis-programming.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1118"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/yuis-programming.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1118"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/yuis-programming.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1118"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}