{"height":"190","provider_name":"Hatena Blog","blog_title":"Sexually Knowing","type":"rich","description":"Add unite-git_conflicts \u00b7 88d6b0e \u00b7 aereal/dotfiles \u00b7 GitHub\u30d7\u30e9\u30b0\u30a4\u30f3\u306a\u3093\u3066\u5f62\u306b\u306a\u3063\u3066\u306a\u3044\u3051\u3069\u7269\u306f\u8a66\u3057\u3068\u3044\u3046\u3053\u3068\u3067\u4f5c\u3063\u3066\u307f\u305f\u3002Git\u3067\u885d\u7a81\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4e00\u89a7\u3057\u3066\u3069\u3046\u3053\u3046\u3059\u308b\u306e\u3001git-ls-files --unmerged \u304c\u7d39\u4ecb\u3055\u308c\u3066\u3044\u305f\u3051\u3069\u3001\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u304c\u7169\u96d1\u3059\u304e\u308b\u306e\u3067 git-diff-files \u3092\u4f7f\u3063\u305f\u3002 \u6700\u8fd1\u306eGit\u3058\u3083\u306a\u3044\u3068\u52d5\u304b\u306a\u3044\u3068\u304b\u3042\u308b\u304b\u3082\u3057\u308c\u306a\u3044\u3051\u3069\u305d\u3093\u306a\u3053\u3068\u306a\u3044\u6c17\u3082\u3059\u308b\u3002Git\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4e2d\u306b\u3044\u306a\u3044\u3068\u304d\u306e\u4f8b\u5916\u51e6\u7406\u304f\u3089\u3044\u3084\u3063\u305f\u3089\u30d7\u30e9\u30b0\u30a4\u30f3\u3068\u3057\u3066\u30d1\u30c3\u30b1\u30fc\u30b8\u5316\u3059\u308b\u304b\u3082\u3057\u308c\u306a\u3044\u3002git/conflict \u3063\u3066\u3044\u3046\u540d\u524d\u7a7a\u2026","image_url":null,"version":"1.0","url":"https://this.aereal.org/entry/2012/07/28/032951","width":"100%","author_url":"https://blog.hatena.ne.jp/aereal/","published":"2012-07-28 03:29:51","categories":["Vim","unite.vim","Git"],"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fthis.aereal.org%2Fentry%2F2012%2F07%2F28%2F032951\" title=\"Git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4e00\u89a7\u3059\u308bunite.vim\u306e\u30bd\u30fc\u30b9 - Sexually Knowing\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","title":"Git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4e00\u89a7\u3059\u308bunite.vim\u306e\u30bd\u30fc\u30b9","author_name":"aereal","provider_url":"https://hatena.blog","blog_url":"https://this.aereal.org/"}