{"id":3243,"date":"2015-10-28T10:30:30","date_gmt":"2015-10-28T01:30:30","guid":{"rendered":"http:\/\/aatljapan.wpengine.com\/?p=3243"},"modified":"2015-10-28T10:30:30","modified_gmt":"2015-10-28T01:30:30","slug":"cool-features-git-2-x","status":"publish","type":"post","link":"https:\/\/www.atlassian.com\/ja\/blog\/cool-features-git-2-x","title":{"rendered":"Git 2.x \u30b7\u30ea\u30fc\u30ba\u306e 6 \u3064\u306e\u7d20\u6674\u3089\u3057\u3044\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc"},"content":{"rendered":"<p>\u79c1\u304c <a href=\"http:\/\/aatljapan.wpengine.com\/2014\/06\/happened-git-2-0-full-goodies\/\">Git<\/a> <a href=\"http:\/\/aatljapan.wpengine.com\/2014\/02\/whats-new-git-1-9\/\">\u30ea\u30ea\u30fc\u30b9<\/a> <a href=\"http:\/\/aatljapan.wpengine.com\/2013\/12\/whats-new-git-1-8-5\/\">\u30ce\u30fc\u30c8<\/a>\u3092\u30ec\u30d3\u30e5\u30fc\u3057\u3066\u304b\u3089\u3057\u3070\u3089\u304f\u7d4c\u3061\u307e\u3057\u305f\u304c \u3001\u3060\u304b\u3089\u3068\u3044\u3063\u3066\u79c1\u304c\u6700\u65b0\u306e\u30ce\u30fc\u30c8\u3092\u71b1\u5fc3\u306b\u8aad\u3093\u3067\u304a\u3089\u305a\u3001\u6bce\u65e5\u306e\u4f5c\u696d\u306b\u65b0\u305f\u306a\u512a\u308c\u30e2\u30ce\u3092\u53d6\u308a\u5165\u308c\u3066\u3044\u306a\u304b\u3063\u305f\u8a33\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u81ea\u5206\u306e\u8a95\u751f\u65e5 (\u62cd\u624b\uff01) \u3068\u3001\u5148\u65e5\u306e <a href=\"http:\/\/aatljapan.wpengine.com\/2015\/09\/1-in-3-fortune-500-companies-agree-bitbucket-is-the-git-solution-for-professional-teams\/\">Bitbucket Server \u306e\u30ea\u30ea\u30fc\u30b9<\/a>\u3092\u795d\u3046\u305f\u3081\u3001\u672c\u65e5\u306f\u79c1\u304c Git <tt>2.x<\/tt> \u30b7\u30ea\u30fc\u30ba (<tt>2.6<\/tt> \u307e\u3067) \u3067\u6c17\u306b\u5165\u3063\u3066\u3044\u308b\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u3092\u5168\u3066\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002\u3069\u308c\u304b\u5f79\u306b\u7acb\u3064\u3088\u3046\u306a\u3053\u3068\u304c\u3042\u308c\u3070\u3001\u662f\u975e\u3054\u4e00\u5831\u304f\u3060\u3055\u3044\u3002\n<\/p>\n<h2 id=\"stashing-your-changes-before-rebase\">\u30ea\u30d9\u30fc\u30b9\u524d\u306b\u5909\u66f4\u5185\u5bb9\u3092\u30b9\u30bf\u30c3\u30b7\u30e5<\/h2>\n<p>Git <tt>2.6<\/tt> \u3067\u306f\u3001<tt>rebase<\/tt> \u30b3\u30de\u30f3\u30c9\u304c\u7686\u3055\u3093\u304b\u3089\u826f\u3044\u610f\u5473\u3067\u306e\u6ce8\u76ee\u3092\u6d74\u3073\u307e\u3057\u305f\u3002\u4ee5\u4e0b\u306b\u3054\u7d39\u4ecb\u3059\u308b\u306e\u306f\u3001\u3088\u308a\u8208\u5473\u6df1\u3044\u65b0\u3057\u3044\u30d5\u30e9\u30b0\u306e1\u3064\u3067\u3059 :<\/p>\n<p><code class=\"lang-bash\">git rebase --autostash<\/code><\/p>\n<p>\u3053\u308c\u304b\u3089\u306f\u3001<tt>rebase<\/tt> \u64cd\u4f5c\u306e\u958b\u59cb\u6642\u306b\u672a\u30b3\u30df\u30c3\u30c8\u306e\u5909\u66f4\u5185\u5bb9\u3092\u4e00\u6642\u7684\u306b\u30b9\u30bf\u30c3\u30b7\u30e5\u3059\u308b\u304b\u3001\u64cd\u4f5c\u3092\u5931\u6557\u3055\u305b\u308b\u304b\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\u3053\u306e\u884c\u52d5\u3092\u6052\u4e45\u7684\u306b\u3059\u308b\u306b\u306f\u3001\u6b21\u306e\u65b0\u3057\u3044\u8a2d\u5b9a\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u7528\u3044\u307e\u3059\uff1a<tt>rebase.autostash<\/tt>\u3002<\/p>\n<p> <tt>true<\/tt> \u306b\u8a2d\u5b9a\u3059\u308b\u3068\u3001Git \u306f <tt>rebase<\/tt> \u64cd\u4f5c\u306e\u958b\u59cb\u524d\u306b\u672a\u30b3\u30df\u30c3\u30c8\u306e\u5909\u66f4\u5185\u5bb9\u3092\u30b9\u30bf\u30c3\u30b7\u30e5\u3057\u3001\u64cd\u4f5c\u306e\u7d42\u4e86\u6642\u306b\u518d\u3073\u5909\u66f4\u5185\u5bb9\u3092\u9069\u7528\u3057\u307e\u3059\u3002\u3053\u306e\u6a5f\u80fd\u3092\u30aa\u30f3\u306b\u3057\u305f\u5834\u5408\u306f\u3001\u30b9\u30bf\u30c3\u30b7\u30e5\u3057\u305f\u5185\u5bb9\u304c\u5143\u306e\u72b6\u614b\u306b\u623b\u308b\u969b\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u53ef\u80fd\u6027\u306b\u5099\u3048\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<p><tt>autostash<\/tt> \u30d5\u30e9\u30b0\u3092\u30aa\u30f3\u306b\u3057\u305f\u5834\u5408\u306f\u3001<strong>\u6b21\u306e<\/strong> <tt>2.7<\/tt> \u30ea\u30ea\u30fc\u30b9\u306b\u3088\u308b\u65b0\u3057\u3044 <tt>--no-autostash<\/tt> \u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u7528\u3044\u308b\u3053\u3068\u3067\u3001\u4e00\u6642\u7684\u306b\u3053\u308c\u3092\u7121\u52b9\u5316\u3067\u304d\u307e\u3059\u3002<\/p>\n<h2 id=\"better-handling-of-multiple-clones-git-worktree\">\u8907\u6570\u30af\u30ed\u30fc\u30f3\u306e\u512a\u308c\u305f\u53d6\u308a\u6271\u3044: Git Worktree<\/h2>\n<p>Git 2.5 \u3067\u306f\u3001\u65b0\u305f\u306a <tt>worktree<\/tt> \u30b3\u30de\u30f3\u30c9\u304c\u5c0e\u5165\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u540c\u3058\u30eb\u30fc\u30c8 \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6e08\u307f\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3092\u8907\u6570\u4fdd\u6301\u3059\u308b\u3053\u3068\u3092\u53ef\u80fd\u306b\u3057\u307e\u3059\u3002\u7d20\u6674\u3089\u3057\u3044\u3067\u3059\u306d\u3002<\/p>\n<p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u304c\u8a95\u751f\u3059\u308b\u4ee5\u524d\u3001\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u5207\u308a\u66ff\u3048\u3066\u7570\u306a\u308b\u30b9\u30c8\u30ea\u30fc\u30e0\u3092\u540c\u6642\u306b\u4f5c\u696d\u3059\u308b\u306b\u306f\u6b21\u306e\u3044\u304f\u3064\u304b\u306e\u65b9\u6cd5\u304c\u3042\u308a\u307e\u3057\u305f: <\/p>\n<ul>\n<li>\u73fe\u5728\u306e\u672a\u30b3\u30df\u30c3\u30c8\u306e\u5909\u66f4\u5185\u5bb9\u3092\u30b9\u30bf\u30c3\u30b7\u30e5\u3057\u3066\u3001\u7570\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u3092 <tt>checkout<\/tt> (<tt>git stash<\/tt> \u3092\u5229\u7528)\u3002<\/li>\n<li>\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b work-in-progress (\u5373\u3061 <tt>WIP<\/tt>) \u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u3066\u3001\u4f5c\u696d\u5185\u5bb9\u306e\u4fdd\u5b58\u3068\u30d6\u30e9\u30f3\u30c1\u306e\u5207\u308a\u66ff\u3048\u3092\u5b9f\u884c\u3002<\/li>\n<li>\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5b8c\u5168\u306a\u30af\u30ed\u30fc\u30f3\u3092\u5225\u306b\u4f5c\u6210\u3057\u30012 \u3064\u306e\u9032\u884c\u4e2d\u306e\u958b\u767a\u52aa\u529b\u3092\u5225\u3005\u304b\u3064\u4e26\u884c\u3057\u3066\u9032\u3081\u308b\u3002<\/li>\n<li> <a href=\"https:\/\/git-scm.com\/blog\/2010\/04\/11\/environment.html\">\u30b3\u30b3<\/a>\u3067\u89e3\u8aac\u3057\u305f\u3088\u3046\u306b\u3001\u74b0\u5883\u5909\u6570\u3067\u3042\u308b <tt>GIT_WORK_TREE<\/tt> \u307e\u305f\u306f<tt>GIT_DIR<\/tt> \u3092\u8a2d\u5b9a\u3002<\/li>\n<\/ul>\n<p> <tt>worktree<\/tt> \u3067\u3042\u308c\u3070\u3001\u4efb\u610f\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6e08\u307f <tt>branch<\/tt>\u3001\u3044\u308f\u3070 <tt>ref<\/tt> \u3092\u5099\u3048\u305f\u30eb\u30fc\u30c8\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u30fc\u3092\u4f5c\u6210\u3057\u3001\u7d42\u4e86\u3059\u308b\u307e\u3067\u4f5c\u696d\u3092\u7d9a\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306e\u304a\u304b\u3052\u3067\u3001- <em>\u30a2\u30a6\u30c8\u30aa\u30d6\u30d0\u30f3\u30c9<\/em> &#8211; \u30af\u30ed\u30fc\u30f3\u3092\u5225\u9014\u306b\u4f5c\u6210\u3059\u308b\u5fc5\u8981\u304c\u306a\u304f\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u305d\u308c\u3067\u306f\u3001\u3042\u306a\u305f\u304c <tt>develop<\/tt> \u30d6\u30e9\u30f3\u30c1\u306e\u4f5c\u696d\u306b\u697d\u3057\u304f\u53d6\u308a\u7d44\u3093\u3067\u3044\u305f\u3068\u3053\u308d\u3001\u81a8\u5927\u306a\u5909\u66f4\u5185\u5bb9\u3092\u4f34\u3046 <tt>rewrite<\/tt> \u30d6\u30e9\u30f3\u30c1\u306e\u4f5c\u696d\u3092\u6570\u65e5\u9593\u306b\u308f\u305f\u3063\u3066\u884c\u3046\u3088\u3046\u547d\u3058\u3089\u308c\u305f\u3068\u3057\u307e\u3057\u3087\u3046\u3002\u3053\u306e\u5834\u5408\u3067\u3082\u3001\u3053\u306e\u5927\u639b\u304b\u308a\u306a\u4f5c\u696d\u306b\u5411\u3051\u3066 <tt>worktree<\/tt> \u3092\u4f5c\u6210\u3057\u3001\u4ed6\u306e\u9032\u884c\u4e2d\u306e\u4f5c\u696d\u3092\u305d\u306e\u307e\u307e\u306b\u3057\u3066\u304a\u304f\u3053\u3068\u304c\u53ef\u80fd\u3068\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306e\u69cb\u6587\u306f\u3001\u4ee5\u4e0b\u306e\u901a\u308a\u3067\u3059:<\/p>\n<p><code class=\"lang-bash\">git worktree add [-f] [--detach] [-b <new-branch>] <path> [<branch>]<\/code> <\/p>\n<p>\u3088\u3063\u3066\u3001\u4eca\u6319\u3052\u305f\u4f8b\u3067\u306f\u3001\u6b21\u306e\u3088\u3046\u306a\u30b3\u30de\u30f3\u30c9\u304c\u3067\u304d\u3042\u304c\u308a\u307e\u3059: <\/p>\n<p> <code class=\"lang-bash\">git worktree add rewrite-folder rewrite<\/code> <\/p>\n<p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u3001\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6e08\u307f\u30d6\u30e9\u30f3\u30c1\u306e <tt>rewrite<\/tt> \u3092\u542b\u3080\u3001<tt>rewrite-folder<\/tt> (\u3053\u3053\u306b\u7591\u554f\u306e\u4f59\u5730\u306f\u3042\u308a\u307e\u305b\u3093\u306d) \u3068\u3044\u3046\u540d\u306e\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u30fc\u3092\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30eb\u30fc\u30c8\u306b\u4f5c\u6210\u3057\u307e\u3059\u3002<\/p>\n<p>\u307e\u308b\u3067 Git \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30eb\u30fc\u30c8\u306b\u3042\u308b\u304b\u306e\u3054\u3068\u304f\u3001\u3053\u306e\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u30fc\u304b\u3089\u306f\u30d7\u30c3\u30b7\u30e5\u3042\u308b\u3044\u306f\u30d7\u30eb\u3059\u308b\u3053\u3068\u304c\u53ef\u80fd\u3067\u3042\u308a\u3001\u4f5c\u696d\u304c\u7d42\u4e86\u5f8c\u306b\u306f\u5358\u306b <tt>rewrite-folder<\/tt> \u3092\u524a\u9664\u3059\u308b\u3060\u3051\u3067\u6e08\u307f\u307e\u3059\u3002<tt>.git\/worktrees<\/tt> \u306b\u4fdd\u7ba1\u3055\u308c\u305f\u7ba1\u7406\u30d5\u30a1\u30a4\u30eb\u306f\u3044\u305a\u308c\u53d6\u308a\u9664\u304b\u308c\u307e\u3059\u304c\u3001\u5fb9\u5e95\u3057\u3066\u305d\u306e\u30c7\u30fc\u30bf\u3092\u53d6\u308a\u9664\u304d\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u3092\u5b9f\u884c\u3057\u307e\u3059:<\/p>\n<p><code class=\"lang-bash\">git worktree prune [-n] [-v] [--expire <expire>]<\/code> <\/p>\n<h2 id=\"quicker-fixes-with-git-commit-fixup-\"><tt>git commit --fixup<\/tt> \u3092\u5229\u7528\u3057\u3066\u3001\u7d20\u65e9\u3044\u4fee\u6b63\u3092<\/h2>\n<p>\u79c1\u304c\u3053\u306e\u70b9\u306b\u6ce8\u76ee\u3057\u305f\u306e\u306f\u3001Git \u306e\u30b3\u30f3\u30c8\u30ea\u30d3\u30e5\u30fc\u30bf\u30fc\u3067\u3042\u308b Luke Diamand \u304c\u6700\u65b0\u306e <a href=\"http:\/\/git.github.io\/rev_news\/2015\/10\/14\/edition-8\/\">Git Rev News<\/a> \u306e\u30a4\u30f3\u30bf\u30d3\u30e5\u30fc\u306b\u304a\u3044\u3066\u3001\u3053\u306e\u3068\u3053\u308d\u6700\u3082\u6c17\u306b\u5165\u3063\u3066\u3044\u308b Git \u6a5f\u80fd\u306f <tt>git commit --fixup<\/tt> \u3067\u3042\u308b\u3068\u8a9e\u3063\u3066\u3044\u305f\u304b\u3089\u3067\u3057\u305f\u3002<\/p>\n<p>\u3053\u308c\u3092\u5229\u7528\u3059\u308b\u306b\u306f\u3001\u6b21\u306e\u8a2d\u5b9a\u3092\u628a\u63e1\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u307e\u305a\u3001\u3042\u306a\u305f\u304c\u3042\u308b\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u3082\u3057\u304f\u306f\u30d0\u30b0\u4fee\u6b63\u306b\u53d6\u308a\u7d44\u3093\u3067\u3044\u308b\u3068\u3057\u307e\u3059\u3002\u307e\u3060\u3001\u305d\u306e\u30b3\u30fc\u30c9\u306f\u8ab0\u3068\u3082\u5171\u6709\u3057\u3066\u3044\u306a\u3044\u306e\u3067\u3059\u304c\u3001\u3042\u308b\u3079\u304d\u3067\u306f\u306a\u3044\u30b3\u30fc\u30c9\u3092\u524a\u9664\u3059\u308b\u304b\u3001\u4f59\u5206\u306a (\u4e71\u308c\u305f) \u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u306a\u304f\u30d0\u30b0\u4fee\u6b63\u3092\u884c\u3046\u306a\u3069\u306e\u7406\u7531\u304b\u3089\u3001\u524d\u56de\u306e\u975e <tt>HEAD<\/tt> \u30b3\u30df\u30c3\u30c8\u306e 1 \u3064\u3092\u5909\u66f4\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3053\u3068\u306b\u6c17\u4ed8\u3044\u3066\u3057\u307e\u3044\u307e\u3059\u3002\u3053\u3053\u3067\u5f79\u7acb\u3064\u306e\u304c\u3001<tt>commit --fixup<\/tt> \u3067\u3059:<\/p>\n<p>\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u8868\u793a\u3055\u308c\u308b\u3001ID <tt>026b6b5<\/tt> \u306e\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308b\u3068\u4eee\u5b9a\u3057\u307e\u3057\u3087\u3046:<\/p>\n<p> <code class=\"lang-bash\">026b6b5 [2 days ago] Implement feature A [Author]<\/code> <\/p>\n<p>\u81ea\u5206\u306e\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306b\u82e5\u5e72\u306e\u5909\u66f4\u3092\u884c\u3044\u3001\u3053\u308c\u3092\u305d\u306e\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30b3\u30df\u30c3\u30c8\u306e &quot;<tt>fixup<\/tt>&quot; \u3068\u3057\u3066\u30de\u30fc\u30af\u3092\u4ed8\u3051\u307e\u3059:<\/p>\n<p> <code class=\"lang-bash\">git commit -a --fixup 026b6b5<\/code> <\/p>\n<p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u304c\u4f5c\u6210\u3059\u308b\u30b3\u30df\u30c3\u30c8\u306f\u3001\u6b21\u306e\u3088\u3046\u306b\u8868\u793a\u3055\u308c\u307e\u3059:<\/p>\n<p> <code class=\"lang-bash\">4b7076f [6 seconds ago] (HEAD -> feature-a) fixup! Implement feature A [Author]<\/code> <\/p>\n<p>\u3053\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u30d7\u30c3\u30b7\u30e5\u3059\u308b\u524d\u306e\u6700\u7d42\u30b9\u30c6\u30c3\u30d7\u3068\u3057\u3066\u3001<tt>--autosquash<\/tt> \u3092\u7528\u3044\u305f\u30a4\u30f3\u30bf\u30e9\u30af\u30c6\u30a3\u30d6\u306a <tt>rebase<\/tt> \u3092\u884c\u3044\u307e\u3059\u3002Git \u306f\u4e0a\u8ff0\u306e <tt>fixup!<\/tt> \u306e\u3088\u3046\u306a\u6ce8\u91c8\u4ed8\u304d\u30b3\u30df\u30c3\u30c8\u3092\u62fe\u3044\u3001\u4fee\u6b63\u5185\u5bb9\u3092\u9069\u5207\u306a\u5834\u6240\u306b\u7d44\u307f\u8fbc\u3093\u3067\u304f\u308c\u307e\u3059:<\/p>\n<p> <code class=\"lang-bash\">git rebase --interactive --autosquash master<\/code> <\/p>\n<p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u3001\u6b63\u3057\u3044\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u65e2\u306b\u8a18\u5165\u3055\u308c\u305f\u30ea\u30d9\u30fc\u30b9\u306e\u30a4\u30f3\u30bf\u30e9\u30af\u30c6\u30a3\u30d6\u30b7\u30fc\u30c8\u4e0a\u3067\u3001\u30a8\u30c7\u30a3\u30bf\u30fc\u3092\u958b\u3044\u3066\u304f\u308c\u307e\u3059\u3002\u304a\u4f7f\u3044\u306e <tt>.gitconfig<\/tt> \u306b\u304a\u3044\u3066\u3001\u30b0\u30ed\u30fc\u30d0\u30eb\u5909\u6570\u3067\u3042\u308b <tt>rebase.autosquash=true<\/tt> \u3092\u8a2d\u5b9a\u6e08\u307f\u306e\u5834\u5408\u3001<tt>--autosquash<\/tt> \u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u7701\u7565\u3067\u304d\u307e\u3059\u3002<\/p>\n<h2 id=\"track-topic-branches-with-show-branch-topics-\"><tt>show-branch --topics<\/tt> \u3067\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u8ffd\u8de1<\/h2>\n<p>Git \u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306b\u3088\u308b\u3068\u3001<tt>show-branch<\/tt> \u30b3\u30de\u30f3\u30c9\u306f &quot;<em> <tt>&lt;rev&gt;s<\/tt> \u307e\u305f\u306f <tt>&lt;globs&gt;s<\/tt> \u3068\u540d\u3065\u3051\u3089\u308c\u305f\u30b3\u30df\u30c3\u30c8\u304b\u3089\u59cb\u307e\u308b\u30b3\u30df\u30c3\u30c8\u5bb6\u7cfb\u56f3\u3092\u534a\u8996\u899a\u7684\u306b\u8868\u793a\u3059\u308b<\/em>&quot; \u3068\u89e3\u8aac\u3055\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n<p><tt>--topics<\/tt> \u30d5\u30e9\u30b0\u3092\u52a0\u3048\u308b\u3068\u3001\u4e0e\u3048\u3089\u308c\u305f\u30d6\u30e9\u30f3\u30c1\u306b\u306f\u7121\u3044\u30b3\u30df\u30c3\u30c8\u306e\u307f\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u30e1\u30a4\u30f3\u30d6\u30e9\u30f3\u30c1\u306b\u65e2\u306b\u8868\u793a\u3055\u308c\u3066\u3044\u308b\u30b3\u30df\u30c3\u30c8\u3092\u7d20\u65e9\u304f\u96a0\u3059\u969b\u306b\u4fbf\u5229\u3067\u3059\u3002<tt>2.5<\/tt> \u3067\u52a0\u3048\u3089\u308c\u305f\u6539\u5584\u306b\u3088\u3063\u3066\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u304c\u6210\u308a\u7acb\u3061\u307e\u3059:<\/p>\n<p> <code class=\"lang-bash\">git show-branch --topics HEAD<\/code> <\/p>\n<p>\u4e0e\u3048\u3089\u308c\u305f\u30b3\u30df\u30c3\u30c8\u3092\u3001\u5168\u3066\u306e\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3068\u6bd4\u8f03\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002\u4f8b\u3048\u3070\u3001\u3053\u306e\u30d6\u30ed\u30b0\u3092\u542b\u3093\u3060\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3001\u6b21\u306e\u3088\u3046\u306a\u7d50\u679c\u3068\u306a\u308a\u307e\u3059:<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/Screen-Shot-2015-10-28-at-9.36.06-AM-e1445992618819.png\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/Screen-Shot-2015-10-28-at-9.36.06-AM-e1445992618819.png\" alt=\"Screen Shot 2015-10-28 at 9.36.06 AM\" width=\"650\" height=\"271\" class=\"aligncenter size-full wp-image-3245\" \/><\/a><\/p>\n<h2 id=\"negative-grepping-\">\u30cd\u30ac\u30c6\u30a3\u30d6\u306a &quot;grepping&quot;<\/h2>\n<p>\u6642\u3005\u3001\u30e1\u30c3\u30bb\u30fc\u30b8\u5185\u306b\u5177\u4f53\u7684\u306a\u30b9\u30c8\u30ea\u30f3\u30b0\u3092<em>\u6301\u305f\u306a\u3044<\/em>\u30b3\u30df\u30c3\u30c8\u3092\u63a2\u3057\u305f\u3044\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u3053\u3067\u5f79\u7acb\u3064\u306e\u306f\u3001\u65b0\u3057\u3044\u30d5\u30e9\u30b0\u3067\u3042\u308b <tt>--invert-grep<\/tt> \u3067\u3059\u3002\u4f8b\u3048\u3070\u3001\u7279\u5b9a\u306e\u8ab2\u984c ID \u3092\u542b\u307e\u306a\u3044\u5168\u3066\u306e\u30b3\u30df\u30c3\u30c8\u3092\u63a2\u3059\u306b\u306f\u3001\u4ee5\u4e0b\u3092\u884c\u3044\u307e\u3059:<\/p>\n<p> <code class=\"lang-bash\">git log --invert-grep --grep=PRJ-25<\/code> <\/p>\n<p>\u3053\u308c\u306b\u3088\u3063\u3066\u3001\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u5185\u306b <tt>PRJ-25<\/tt> \u3092\u542b\u307e\u306a\u3044\u3001\u5168\u3066\u306e\u30b3\u30df\u30c3\u30c8\u304c\u8fd4\u3055\u308c\u307e\u3059\u3002\u898b\u4e8b\u3067\u3059\u306d\u3002<\/p>\n<h2 id=\"atomic-pushes\">Atomic \u306a\u30d7\u30c3\u30b7\u30e5<\/h2>\n<p>\u306f\u3060\u304b\u306e <tt>git push<\/tt> \u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u884c\u52d5\u3092\u5b9a\u7fa9\u3059\u308b\u306b\u306f\u3001<a href=\"http:\/\/aatljapan.wpengine.com\/2014\/06\/happened-git-2-0-full-goodies\/\">push.default<\/a> \u8a2d\u5b9a\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u540c\u6642\u306b\u8907\u6570\u306e\u30d6\u30e9\u30f3\u30c1\u3082\u3057\u304f\u306f\u30bf\u30b0\u3092\u30d7\u30c3\u30b7\u30e5\u3059\u308b\u3068\u3044\u3046\u5177\u5408\u306b\u3001\u30d7\u30c3\u30b7\u30e5\u30b3\u30de\u30f3\u30c9\u304c 1 \u3064\u4ee5\u4e0a\u306e <tt>ref<\/tt> \u3092\u66f4\u65b0\u3057\u3066\u3044\u308b\u30b1\u30fc\u30b9\u306b\u304a\u3044\u3066\u3001\u4eca\u5f8c\u306f\u66f4\u65b0\u304c\u78ba\u5b9f\u306b<strong>\u5168\u3066<\/strong>\u6210\u529f\u3001\u3082\u3057\u304f\u306f<strong>\u5168\u3066<\/strong>\u5931\u6557\u3059\u308b\u3088\u3046\u3001\u65b0\u3057\u3044\u30aa\u30d7\u30b7\u30e7\u30f3\u3068\u3057\u3066 <tt>--atomic<\/tt> \u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002<\/p>\n<h2 id=\"conclusions\">\u7d50\u8ad6<\/h2>\n<p>\u4ee5\u4e0a\u3067\u5168\u3066\u3067\u3059\u3002\u8208\u5473\u6df1\u3044\u5185\u5bb9\u306f\u3042\u308a\u307e\u3057\u305f\u304b\uff1f\u7686\u3055\u3093\u306f\u65e5\u3005\u306e\u958b\u767a\u4f5c\u696d\u3067\u3001\u4ed6\u306b\u3082\u96e3\u89e3\u306a\u30d5\u30e9\u30b0\u3092\u7528\u3044\u3066\u3044\u307e\u3059\u304b\uff1f\u79c1\u306f\u3044\u3064\u3067\u3082\u65b0\u305f\u306a\u79d8\u8a23\u3084\u30d5\u30e9\u30b0\u3092\u7fd2\u5f97\u3057\u305f\u3044\u3068\u601d\u3063\u3066\u307e\u3059\u306e\u3067\u3001<a href=\"https:\/\/www.twitter.com\/durdn\">@durdn<\/a> \u307e\u305f\u306f <a href=\"https:\/\/www.twitter.com\/atlassiandev\">@atlassiandev<\/a> \u5b9b\u3066\u306b\u30c4\u30a4\u30fc\u30c8\u3057\u3066\u9802\u304f\u304b\u3001\u3053\u3053\u306b\u30b3\u30e1\u30f3\u30c8\u3092\u6b8b\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n<p><\/br><br \/>\n<small><br \/>\n*\u672c\u30d6\u30ed\u30b0\u306f Atlassian Developers \u306e\u7ffb\u8a33\u3067\u3059\u3002\u672c\u6587\u4e2d\u306e\u65e5\u6642\u306a\u3069\u306f\u6295\u7a3f\u5f53\u6642\u306e\u3082\u306e\u3067\u3059\u306e\u3067\u3054\u4e86\u627f\u304f\u3060\u3055\u3044\u3002<br \/>\n*\u539f\u6587 : 2015 \u5e74 10 \u6708 26 \u65e5\u6295\u7a3f \"<a href=\"https:\/\/developer.atlassian.com\/blog\/2015\/10\/cool-features-git-2.x\/\" target=\"_blank\">Six cool features of the Git 2.x series<\/a>\"<br \/>\n<\/small><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u79c1\u304c Git \u30ea\u30ea\u30fc\u30b9 \u30ce\u30fc\u30c8\u3092\u30ec\u30d3\u30e5\u30fc\u3057\u3066\u304b\u3089\u3057\u3070\u3089\u304f\u7d4c\u3061\u307e\u3057\u305f\u304c \u3001\u3060\u304b\u3089\u3068\u3044\u3063\u3066\u79c1\u304c\u6700\u65b0\u306e\u30ce\u30fc\u30c8\u3092\u71b1\u5fc3\u306b\u8aad\u3093\u3067\u304a\u3089\u305a\u3001\u6bce\u65e5\u306e\u4f5c\u696d\u306b\u65b0\u305f\u306a\u512a\u308c\u30e2\u30ce\u3092\u53d6\u308a\u5165\u308c\u3066\u3044\u306a\u304b\u3063\u305f\u8a33\u3067\u306f\u3042&hellip;<\/p>\n","protected":false},"author":275,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"bitbucket_subtitle":"","footnotes":""},"categories":[1],"tags":[103],"coauthors":[],"class_list":["post-3243","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-git"],"acf":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/3243","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/users\/275"}],"replies":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/comments?post=3243"}],"version-history":[{"count":0,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/3243\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/media?parent=3243"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/categories?post=3243"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/tags?post=3243"},{"taxonomy":"author","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/coauthors?post=3243"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}