{"image_url":null,"url":"https://teramako.hatenadiary.org/entry/20081203/p2","categories":["vimperator"],"height":"190","blog_url":"https://teramako.hatenadiary.org/","type":"rich","author_name":"teramako","width":"100%","title":"\u30aa\u30a4\u30e9\u3082git\u826f\u304f\u5206\u304b\u3063\u3066\u306a\u3044\u3051\u3069\u3001\u5909\u66f4\u70b9\u306e\u30aa\u30a4\u30e9\u7684\u6d17\u3044\u51fa\u3057\u65b9\u6cd5","version":"1.0","published":"2008-12-03 00:00:00","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fteramako.hatenadiary.org%2Fentry%2F20081203%2Fp2\" title=\"\u30aa\u30a4\u30e9\u3082git\u826f\u304f\u5206\u304b\u3063\u3066\u306a\u3044\u3051\u3069\u3001\u5909\u66f4\u70b9\u306e\u30aa\u30a4\u30e9\u7684\u6d17\u3044\u51fa\u3057\u65b9\u6cd5 - hogehoge @teramako\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","description":"\u306f\u3058\u3081\u3066git pull\u3057\u305f\u3089vimperator\u304c\u3044\u304d\u306a\u308a\u52d5\u304b\u306a\u304f\u306a\u3063\u3066\u3061\u3087\u3063\u3068\u7126\u3063\u305f - \u4eca\u65e5\u3082\u30b9\u30df\u30de\u30bb\u30f3\u3002 git pull\u3059\u308b\u307e\u3048\u306b git branch localbranch\u3067\u30d6\u30e9\u30f3\u30c1\u4f5c\u6210 git pull\u3059\u308b git diff master localbranch\u3067diff\u3092\u898b\u308b git branch -D localbranch\u3067\u30d6\u30e9\u30f3\u30c1\u6d88\u3059 \u3063\u3066\u611f\u3058\u3067\u3084\u3063\u3066\u3044\u308b\u3088\u3002 \u3066\u304b\u3001\u4eca\u6c17\u4ed8\u3044\u305f\u3051\u3069\u3001\u672c\u5f53\u306f git pull\u3057\u3066 git log\u304b\u3089\u30b3\u30df\u30c3\u30c8\u306eid\u3092\u30b3\u30d4\u3063\u3066 git diff master id \u3059\u308c\u3070\u826f\u3044\u3093\u3058\u3083\u306a\u3044\u304b\u306a\u3002 \u65e5\u6642\u3067\u5dee\u5206\u53d6\u308b\u65b9\u6cd5\u3082\u3042\u308b\u3068\u601d\u3046\u3093\u3060\u3051\u3069\u3001\u826f\u304f\u5206\u304b\u3089\u2026","blog_title":"hogehoge @teramako","provider_url":"https://hatena.blog","provider_name":"Hatena Blog","author_url":"https://blog.hatena.ne.jp/teramako/"}