{"id":47540,"date":"2017-02-26T10:00:36","date_gmt":"2017-02-26T01:00:36","guid":{"rendered":"http:\/\/www.softantenna.com\/wp\/?p=47540"},"modified":"2017-02-26T10:00:36","modified_gmt":"2017-02-26T01:00:36","slug":"git-2-12","status":"publish","type":"post","link":"https:\/\/softantenna.com\/blog\/git-2-12\/","title":{"rendered":"Git 2.12\u304c\u30ea\u30ea\u30fc\u30b9 - git merge --continue\u30b3\u30de\u30f3\u30c9\u304c\u8ffd\u52a0\u3055\u308c\u308b\u306a\u3069\u591a\u6570\u306e\u5909\u66f4"},"content":{"rendered":"<p><img decoding=\"async\" style=\"display:block; margin-left:auto; margin-right:auto;\" src=\"https:\/\/softantenna.com\/blog\/wp-content\/uploads\/2017\/02\/Is_20170226_94616.jpg\" alt=\"S 20170226 94616\" title=\"s_20170226_94616.jpg\" border=\"0\" width=\"1067\" height=\"655\" \/><\/p>\n<p>Git\u958b\u767a\u30c1\u30fc\u30e0\u306e\u6ff1\u91ce\u7d14\u6c0f\u306f2\u670824\u65e5\u3001\u5206\u6563\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30c4\u30fc\u30eb\u300c<a href=\"https:\/\/git-scm.com\/\">Git<\/a>\u300d\u306e\u6700\u65b0\u7248v2.12.0\u306e\u30ea\u30ea\u30fc\u30b9\u3092<a href=\"https:\/\/lkml.org\/lkml\/2017\/2\/24\/613\">\u30a2\u30ca\u30a6\u30f3\u30b9<\/a>\u3057\u307e\u3057\u305f(<a href=\"http:\/\/www.phoronix.com\/scan.php?page=news_item&px=Git-2.12-Released\">Phoronix<\/a>)\u3002v2.11.0\u30ea\u30ea\u30fc\u30b9\u4ee5\u6765\u300180\u4eba\u306e\u8ca2\u732e\u8005(\u3046\u306124\u4eba\u306f\u65b0\u4eba)\u306b\u3088\u308b\u3001517\u4ef6\u306e\u975e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>Git 2.12\u3067\u306f\u5927\u304d\u306a\u65b0\u6a5f\u80fd\u306f\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093\u304c\u3001\u4f7f\u3044\u52dd\u624b\u3092\u6539\u5584\u3059\u308b\u305f\u3081\u306e\u7d30\u304b\u306a\u4fee\u6b63\u304c\u591a\u6570\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u5177\u4f53\u7684\u306b\u306fp4\u30b5\u30d6\u30b3\u30de\u30f3\u30c9\u95a2\u9023\u306e\u66f4\u65b0\u3084\u3001\u30de\u30fc\u30b8\u6642\u306b\u767a\u751f\u3059\u308b\u885d\u7a81\u3092\u89e3\u6d88\u3059\u308b\"git commit\"\u3068\u540c\u7fa9\u306e\"git merge --continue\"\u30b3\u30de\u30f3\u30c9\u306e\u8ffd\u52a0\u304c\u884c\u308f\u308c\u305f\u307b\u304b\u3001\u591a\u6570\u306e\u30b5\u30d6\u30b3\u30de\u30f3\u30c9\u306e\u6539\u826f\u3001\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u306e\u6539\u5584\u3001Cygwin\u7528\u30d3\u30eb\u30c9\u306e\u66f4\u65b0\u3001\u4e0d\u5177\u5408\u306e\u4fee\u6b63\u306a\u3069\u304c\u884c\u308f\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u5909\u66f4\u306e\u8a73\u7d30\u306f\u30a2\u30ca\u30a6\u30f3\u30b9\u306b\u542b\u307e\u308c\u308b\u30ea\u30ea\u30fc\u30b9\u30ce\u30fc\u30c8\u3067\u78ba\u8a8d\u53ef\u80fd\u3067\u3059\u3002<\/p>\n<table>\n<tr>\n<th rowspan='4' style='white-space: nowrap;'><img decoding=\"async\" style=\"max-width: 52px; height: auto;\" src=\"https:\/\/softantenna.com\/uploads\/software\/6977\/s_icon.png\" alt=\"S icon\" \/><\/th>\n<th style='white-space: nowrap;'>\u30bf\u30a4\u30c8\u30eb<\/th>\n<td>Git<\/td>\n<\/tr>\n<tr>\n<th style='white-space: nowrap;'>\u516c\u5f0f\u30b5\u30a4\u30c8<\/th>\n<td><a href=\"https:\/\/git-scm.com\/\">https:\/\/git-scm.com\/<\/a><\/td>\n<\/tr>\n<tr>\n<th style='white-space: nowrap;'>\u30bd\u30d5\u30c8\u30a2\u30f3\u30c6\u30ca<\/th>\n<td><a href=\"https:\/\/softantenna.com\/softwares\/6977-git\">https:\/\/softantenna.com\/softwares\/6977-git<\/a><\/td>\n<\/tr>\n<tr>\n<th style='white-space: nowrap;'>\u8aac\u660e<\/th>\n<td>Linux\u306e\u958b\u767a\u8005Linus Torvalds\u306b\u3088\u3063\u3066\u958b\u767a\u3055\u308c\u305f\u5206\u6563\u578b\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30c4\u30fc\u30eb\u3002<\/td>\n<\/tr>\n<\/table>\n","protected":false},"excerpt":{"rendered":"<p>Git\u958b\u767a\u30c1\u30fc\u30e0\u306e\u6ff1\u91ce\u7d14\u6c0f\u306f2\u670824\u65e5\u3001\u5206\u6563\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30c4\u30fc\u30eb\u300cGit\u300d\u306e\u6700\u65b0\u7248v2.12.0\u306e\u30ea\u30ea\u30fc\u30b9\u3092\u30a2\u30ca\u30a6\u30f3\u30b9\u3057\u307e\u3057\u305f(Phoronix)\u3002v2.11.0\u30ea\u30ea\u30fc\u30b9\u4ee5\u6765\u300180\u4eba\u306e\u8ca2\u732e\u8005(\u3046\u306124\u4eba\u306f\u65b0\u4eba)\u306b\u3088\u308b\u3001 [&hellip;]<\/p>\n","protected":false},"author":2,"featured_media":47541,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"swell_btn_cv_data":"","footnotes":""},"categories":[75],"tags":[159],"class_list":["post-47540","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-software","tag-git"],"_links":{"self":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/posts\/47540","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/comments?post=47540"}],"version-history":[{"count":0,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/posts\/47540\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/media\/47541"}],"wp:attachment":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/media?parent=47540"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/categories?post=47540"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/tags?post=47540"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}