{"image_url":null,"title":"\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u3066\u4f5c\u696d\u3092\u3057\u3066\u3044\u308b\u9014\u4e2d\u3067git pull\u3057\u3066\u3044\u3044\u306e\u304b","blog_title":"by shigemk2","author_name":"shigemk2","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fwww.shigemk2.com%2Fentry%2F20120825%2F1345879683\" title=\"\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u3066\u4f5c\u696d\u3092\u3057\u3066\u3044\u308b\u9014\u4e2d\u3067git pull\u3057\u3066\u3044\u3044\u306e\u304b - by shigemk2\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","description":"\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u3066\u4f5c\u696d\u3059\u308b\u306e\u306f\u57fa\u672c\u4e2d\u306e\u57fa\u672c\u3001\u3082\u306f\u3084 \u5f53\u305f\u308a\u524d\u306e\u3053\u3068\u3067\u3059\u304c\u3001\u9577\u3089\u304f\u4f5c\u696d\u3057\u3066\u3044\u308b\u3068\u30d6\u30e9\u30f3\u30c1\u306eHEAD\u304c master\u306eHEAD\u3088\u308a\u9065\u304b\u5f8c\u65b9\u3068\u3044\u3046\u3053\u3068\u304c\u3042\u308b\u3068\u601d\u3044\u307e\u3059\u3002\u305d\u3046\u3044\u3046\u3068\u304d\u306f\u3001\u30d6\u30e9\u30f3\u30c1\u306b\u3044\u308b\u3068\u304d\u306b $ git pull --rebase \u3059\u308b\u3068\u3044\u3044\u3068\u601d\u3044\u307e\u3059\u3002 \u3053\u308c\u306f\u3061\u3087\u304f\u3061\u3087\u304f\u3084\u3063\u3066\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u72b6\u614b\u3092\u6700\u65b0\u306b\u3057\u3066\u304a\u304f\u3068\u3088\u3044\u3067\u3057\u3087\u3046\u3002 \u3067\u306a\u3044\u3068\u6700\u5f8c\u306b\u3053\u306e\u30d6\u30e9\u30f3\u30c1\u3092master\u306bmerge\u3059\u308b\u3068\u304d\u306b\u3001 \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u5927\u91cf\u306b\u8d77\u304d\u3066\u3057\u307e\u3046\u3053\u3068\u8acb\u3051\u5408\u3044\u3067\u3059\u3002\u306a\u304a\u3001--rebase\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u3064\u3051\u306a\u3044\u3068\u3001 \u30de\u30fc\u30b8\u3057\u305f\u3053\u3068\u3092\u793a\u3059\u30b3\u30df\u30c3\u30c8\u304c\u8a18\u9332\u3055\u308c\u3066\u3057\u307e\u3046\u306e\u3067\u3001 \u30d6\u30e9\u30f3\u30c1\u306e\u6d41\u308c\u304c\u8907\u96d1\u306b\u306a\u3063\u3066\u3057\u2026","published":"2012-08-25 16:28:03","width":"100%","author_url":"https://blog.hatena.ne.jp/shigemk2/","provider_name":"Hatena Blog","url":"https://www.shigemk2.com/entry/20120825/1345879683","type":"rich","height":"190","categories":["Git"],"blog_url":"https://www.shigemk2.com/","provider_url":"https://hatena.blog","version":"1.0"}