{"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fsinsoku.hatenadiary.org%2Fentry%2F20110926%2F1316968306\" title=\" git-rebase \u3092\u591a\u7528\u3057\u305f\u958b\u767a\u306e\u6d41\u308c - \u30a2\u30b8\u30e3\u30a4\u30ebSE\u3092\u76ee\u6307\u3059\u30d6\u30ed\u30b0\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","categories":["Git"],"url":"https://sinsoku.hatenadiary.org/entry/20110926/1316968306","provider_name":"Hatena Blog","author_name":"sinsoku","blog_title":"\u30a2\u30b8\u30e3\u30a4\u30ebSE\u3092\u76ee\u6307\u3059\u30d6\u30ed\u30b0","width":"100%","title":" git-rebase \u3092\u591a\u7528\u3057\u305f\u958b\u767a\u306e\u6d41\u308c","author_url":"https://blog.hatena.ne.jp/sinsoku/","type":"rich","blog_url":"https://sinsoku.hatenadiary.org/","image_url":null,"provider_url":"https://hatena.blog","height":"190","version":"1.0","description":"git-rebase \u3092\u4f7f\u3063\u305f\u958b\u767a\u306e\u6d41\u308c\u304c\u56fa\u307e\u3063\u3066\u304d\u305f\u306e\u3067\u3001\u30d6\u30ed\u30b0\u3067\u6652\u3057\u3066\u307f\u307e\u3059\u3002\u3053\u306e\u545f\u304d\u304b\u3089\u65e5\u6570\u304c\u7d4c\u3063\u3066\u3044\u308b\u7406\u7531\u306f\u5bdf\u3057\u3066\u304f\u3060\u3055\u3044\u3002 \u3068\u308a\u3042\u3048\u305a\u3001\u30de\u30b0\u30ca\u30fb\u30bc\u30ed\u306f2\u9031\u3057\u3066\u3001\u9ec4\u91d1\u9b54\u5263\u58eb\u306f2\u56de\u6483\u7834\u3057\u307e\u3057\u305f\u3002 \u307e\u305a\u521d\u3081\u306b git-rebase \u306b\u4e0d\u6163\u308c\u306a\u65b9\u306f\u771f\u4f3c\u3057\u306a\u3044\u65b9\u304c\u3044\u3044\u3067\u3059 reflog \u3067git-rebase \u306e\u5931\u6557\u3092\u623b\u305b\u306a\u3044\u4eba\u3082\u771f\u4f3c\u3057\u306a\u3044\u65b9\u304c\u3044\u3044\u3067\u3059 \u7121\u540d\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3057\u3066\u3082\u6ce3\u304b\u306a\u3044\u3088\u3046\u306b \u958b\u767a\u306e\u6d41\u308c \u524d\u63d0 git-pull \u306f\u4f7f\u308f\u305a\u3001git-fetch \u3092\u4f7f\u3046 \u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u3067\u306f\u4f5c\u696d\u3092\u3057\u306a\u3044\uff08\u5fc5\u305a\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u308b\uff09 bash\u306bgit\u306e\u30d6\u30e9\u30f3\u30c1\u540d\u3092\u8868\u793a\u3057\u3066\u304a\u304f\uff08rebase\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u2026","published":"2011-09-26 01:31:46"}