{"width":"100%","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fsinsoku.hatenadiary.org%2Fentry%2F20110831%2F1314720280\" title=\" Git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u6642\u306e\u305f\u3081\u306e\u5099\u5fd8\u9332 - \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>","type":"rich","url":"https://sinsoku.hatenadiary.org/entry/20110831/1314720280","height":"190","image_url":null,"categories":["Git"],"title":" Git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u6642\u306e\u305f\u3081\u306e\u5099\u5fd8\u9332","published":"2011-08-31 01:04:40","provider_url":"https://hatena.blog","blog_title":"\u30a2\u30b8\u30e3\u30a4\u30ebSE\u3092\u76ee\u6307\u3059\u30d6\u30ed\u30b0","version":"1.0","author_name":"sinsoku","blog_url":"https://sinsoku.hatenadiary.org/","description":"\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u3068\u304d\u306b\u4fbf\u5229\u305d\u3046\u306a\u306e\u3067\u3001\u5099\u5fd8\u9332\u3092\u6b8b\u3057\u3066\u304a\u304f Git\u306e\u30b3\u30de\u30f3\u30c9 \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u4e00\u89a7\u3092\u8868\u793a\u3059\u308b\u3002 $ git ls-files -u [<path>] \u30d5\u30a1\u30a4\u30eb\u306e\u72b6\u614b(\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u542b\u3080)\u3092\u8868\u793a\u3059\u308b\u3002 -s \u3067short-format \u3067\u7279\u5b9a\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u30d5\u30a1\u30a4\u30eb\u4e00\u89a7\u3092\u8868\u793a\u3067\u304d\u308b $ git status [<path>] \u624b\u52d5\u3067\u76f4\u3059\u65b9\u6cd5 \u4fee\u6b63\u5f8c\u306badd\u304c\u5fc5\u8981 $ vi <path> (\u624b\u52d5\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u76f4\u3059) $ git add <path> mergetool \u3067\u30de\u30fc\u30b8\u3059\u308b\u65b9\u6cd5 -y \u3067\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30de\u30fc\u30b8\u30c4\u30fc\u30eb\u304c\u5b9f\u884c\u3059\u308b \u30671\u3064\u305a\u3064\u6307\u5b9a\u3067\u304d\u308b $ git mer\u2026","provider_name":"Hatena Blog","author_url":"https://blog.hatena.ne.jp/sinsoku/"}