{"height":"190","published":"2012-07-17 22:56:31","author_name":"sasaplus1","categories":["Git"],"version":"1.0","author_url":"https://blog.hatena.ne.jp/sasaplus1/","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fsasaplus1.hatenadiary.com%2Fentry%2F20120717%2F1342533391\" title=\"\u30b5\u30eb\u3067\u3082\u308f\u304b\u308bGit\u5165\u9580\u3092\u8aad\u3093\u3060\u3088 - \u56db\u89d2\u9769\u547d\u524d\u591c\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","image_url":null,"provider_name":"Hatena Blog","title":"\u30b5\u30eb\u3067\u3082\u308f\u304b\u308bGit\u5165\u9580\u3092\u8aad\u3093\u3060\u3088","url":"https://sasaplus1.hatenadiary.com/entry/20120717/1342533391","type":"rich","width":"100%","provider_url":"https://hatena.blog","blog_title":"\u56db\u89d2\u9769\u547d\u524d\u591c","description":"\u305d\u308d\u305d\u308d\u672c\u5f53\u306bGit\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u308a\u305f\u3044\u3068\u601d\u3063\u3066\u3044\u305f\u77e2\u5148\u306b\u3001\u30b5\u30eb\u3067\u3082\u308f\u304b\u308bGit\u5165\u9580\u306a\u3093\u3066\u3082\u306e\u304cTL\u306b\u6d41\u308c\u3066\u304d\u305f\u306e\u3067\u8aad\u3093\u3067\u307f\u307e\u3057\u305f\u3002 \u4e3b\u306b\u77e5\u3089\u306a\u304b\u3063\u305f\u3053\u3068\u306e\u30e1\u30e2\u3067\u3059\u3002 HEAD\u304b\u3089\u306e\u76f8\u5bfe\u4f4d\u7f6e\u3092\u6307\u5b9a\u3059\u308b\u65b9\u6cd5 HEAD^^^\u3068\u304b\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3042\u308b\u304b\u3068\u601d\u3044\u307e\u3059\u304c\u3001HEAD~3\u306a\u3093\u3066\u6307\u5b9a\u3082\u3067\u304d\u308b\u3093\u3067\u3059\u306d\u3048\u3002 merge\u3068rebase\u306e\u4f7f\u3044\u5206\u3051 \u30b5\u30eb\u3067\u3082\u308f\u304b\u308bGit\u5165\u9580 \u301c\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3092\u4f7f\u3044\u3053\u306a\u305d\u3046\u301c\u3010\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u7ba1\u7406\u30c4\u30fc\u30ebBacklog\u3011 \u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u306b\u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u306e\u30b3\u30fc\u30c9\u3092\u53d6\u308a\u8fbc\u3080\u3068\u304d\u306frebase git pull --rebase\u304b\u306a\uff1f \u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u306b\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u53d6\u308a\u8fbc\u3080\u5834\u5408\u306f\u2026","blog_url":"https://sasaplus1.hatenadiary.com/"}