{"blog_url":"https://naga-sawa.hatenadiary.org/","width":"100%","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fnaga-sawa.hatenadiary.org%2Fentry%2F20101220%2F1292806729\" title=\"msysgit \u3067\u30d5\u30a1\u30a4\u30eb\u3092\u5909\u66f4\u3057\u3066\u3044\u306a\u3044\u306f\u305a\u306a\u306e\u306b merge \u3067\u304d\u306a\u3044\u5834\u5408\u306e\u5bfe\u51e6 - ..\u305f\u308c\u308d\u3050..\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","author_url":"https://blog.hatena.ne.jp/naga_sawa/","published":"2010-12-20 09:58:49","image_url":null,"blog_title":"..\u305f\u308c\u308d\u3050..","provider_url":"https://hatena.blog","height":"190","type":"rich","description":"msysgit \u3092\u4f7f\u3063\u3066\u3044\u3066\u3001\u7ba1\u7406\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4f55\u3082\u5909\u66f4\u3057\u3066\u3044\u306a\u3044\u306f\u305a\u306a\u306e\u306b merge \u3084 pull \u3059\u308b\u3068\u304d\u306b\u3001\u300c\u5909\u66f4\u3055\u308c\u3066\u3044\u308b\u300d\u3068\u30a8\u30e9\u30fc\u306b\u306a\u308b\u5834\u5408\u3002\u305d\u3057\u3066 reset --hard \u3092\u3057\u3066\u3082\u305d\u306e\u30a8\u30e9\u30fc\u304c\u6d88\u305b\u306a\u3044\u5834\u5408\u3002 \u3053\u306e\u5834\u5408\u3001\u30d5\u30a1\u30a4\u30eb\u672c\u4f53\u306b\u5909\u66f4\u306f\u306a\u304f\u3066\u3082 msys \u304b\u3089\u898b\u305f\u5834\u5408\u306e\u30d5\u30a1\u30a4\u30eb\u30e2\u30fc\u30c9\uff08\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\uff09\u304c\u9055\u3063\u3066\u3044\u3066\u3001git \u304c\u305d\u308c\u3092\u300c\u5909\u66f4\u3042\u308a\u300d\u3068\u691c\u77e5\u3057\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002 git diff \u3092\u3057\u305f\u3068\u304d\u306b old mode 100755 new mode 100644\u306e\u3088\u3046\u306b\u30d5\u30a1\u30a4\u30eb\u30e2\u30fc\u30c9(\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3)\u306e\u5909\u66f4\u3060\u3051\u304c\u51fa\u308b\u5834\u5408\u306f\u305f\u3076\u3093\u3053\u306e\u554f\u984c\u3067\u3059\u3002\u3053\u308c\u306b\u5bfe\u51e6\u3059\u308b\u306b\u306f\u3001 >gi\u2026","url":"https://naga-sawa.hatenadiary.org/entry/20101220/1292806729","title":"msysgit \u3067\u30d5\u30a1\u30a4\u30eb\u3092\u5909\u66f4\u3057\u3066\u3044\u306a\u3044\u306f\u305a\u306a\u306e\u306b merge \u3067\u304d\u306a\u3044\u5834\u5408\u306e\u5bfe\u51e6","version":"1.0","author_name":"naga_sawa","categories":["\u958b\u767a"],"provider_name":"Hatena Blog"}