{"id":96983,"date":"2022-04-20T09:04:02","date_gmt":"2022-04-20T00:04:02","guid":{"rendered":"https:\/\/softantenna.com\/blog\/?p=96983"},"modified":"2022-04-20T09:04:02","modified_gmt":"2022-04-20T00:04:02","slug":"git-2-36-released","status":"publish","type":"post","link":"https:\/\/softantenna.com\/blog\/git-2-36-released\/","title":{"rendered":"Git 2.36\u304c\u30ea\u30ea\u30fc\u30b9 - \u30de\u30fc\u30b8\u306e\u7af6\u5408\u306e\u89e3\u6c7a\u3092\u6539\u826f\u3059\u308b\" --remerge-diff\"\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u5c0e\u5165\u306a\u3069"},"content":{"rendered":"<p><img decoding=\"async\" style=\"display:block; margin-left:auto; margin-right:auto;\" src=\"https:\/\/softantenna.com\/blog\/wp-content\/uploads\/2022\/04\/s_20220419_202535.jpg\" alt=\"S 20220419 202535\" title=\"s_20220419_202535.jpg\" border=\"0\" width=\"1048\" height=\"645\" \/><\/p>\n<p>Git\u958b\u767a\u30c1\u30fc\u30e0\u306e\u6ff1\u91ce\u7d14\u6c0f\u306f4\u670818\u65e5(\u73fe\u5730\u6642\u9593)\u3001\u5206\u6563\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30c4\u30fc\u30eb\u300cGit\u300d\u306e\u6700\u65b0\u7248\u300cGit v2.36.0\u300d\u3092<a href=\"https:\/\/lore.kernel.org\/git\/xmqqh76qz791.fsf@gitster.g\/T\/#u\">\u30ea\u30ea\u30fc\u30b9<\/a>\u3057\u307e\u3057\u305f(<a href=\"https:\/\/www.phoronix.com\/scan.php?page=news_item&px=Git-2.36-Released\">Phoronix<\/a>\u3001<a href=\"https:\/\/github.blog\/2022-04-18-highlights-from-git-2-36\/\">The GitHub Blog<\/a>)\u3002<\/p>\n<p>Git v2.36.0\u306fv2.35.0\u4ee5\u6765\u300126\u4eba\u306e\u65b0\u4eba\u3092\u542b\u308096\u4eba\u306e\u8ca2\u732e\u8005\u306b\u3088\u3063\u3066\u4f5c\u6210\u3055\u308c\u305f\u3001717\u4ef6\u306e\u975e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3067\u69cb\u6210\u3055\u308c\u305f\u30ea\u30ea\u30fc\u30b9\u3068\u306a\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>Git v2.36\u3067\u306f\u3001\u30de\u30fc\u30b8\u306e\u7af6\u5408\u306e\u89e3\u6c7a\u3092\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u305f\u3081\u306e\u6a5f\u80fd\u3068\u3057\u3066\u3001\"--remerge-diff\"\u30aa\u30d7\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u30de\u30fc\u30b8\u306b\u3088\u3063\u3066\u885d\u7a81\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3068\u89e3\u6c7a\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3068\u306e\u5dee\u5206\u3092\u8868\u793a\u3057\u3001\u3069\u306e\u3088\u3046\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u89e3\u6c7a\u3057\u305f\u306e\u304b\u7c21\u5358\u306b\u78ba\u8a8d\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u307e\u305f\u3001\u3088\u308a\u67d4\u8edf\u306afsync\u306e\u8a2d\u5b9a\u3082\u53ef\u80fd\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002Git v2.36\u3067\u306f\u3001\u3055\u307e\u3056\u307e\u306a\u7a2e\u985e\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u660e\u793a\u7684\u306bfsync\u3059\u308b\u5834\u5408\u306b\u3001\u3088\u308a\u591a\u304f\u306e\u30e6\u30fc\u30b6\u30fc\u5236\u5fa1\u304c\u53ef\u80fd\u3068\u306a\u308a\u3001\u4f8b\u3048\u3070\u3001\u30c7\u30fc\u30bf\u640d\u5931\u306e\u53ef\u80fd\u6027\u306b\u5099\u3048\u3066\u3088\u308a\u5805\u7262\u6027\u3092\u78ba\u4fdd\u3057\u305f\u3044\u5834\u5408\u306a\u3069\u306b\u6d3b\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u305d\u306e\u307b\u304b\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6240\u6709\u8005\u306e\u30c1\u30a7\u30c3\u30af\u3092\u3088\u308a\u53b3\u3057\u304f\u3059\u308b\u5909\u66f4\u3084\u3001\u305d\u306e\u4ed6\u69d8\u3005\u306a\u5c0f\u3055\u306a\u5909\u66f4\u3001\u4fee\u6b63\u304c\u884c\u308f\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u65b0\u6a5f\u80fd\u306e\u8a73\u7d30\u306f<a href=\"https:\/\/github.blog\/2022-04-18-highlights-from-git-2-36\/\">GitHub Blog<\/a>\u3084<a href=\"https:\/\/www.phoronix.com\/scan.php?page=news_item&px=Git-2.36-Released\">\u30ea\u30ea\u30fc\u30b9\u30ce\u30fc\u30c8<\/a>\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\u306f4\u670818\u65e5(\u73fe\u5730\u6642\u9593)\u3001\u5206\u6563\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30c4\u30fc\u30eb\u300cGit\u300d\u306e\u6700\u65b0\u7248\u300cGit v2.36.0\u300d\u3092\u30ea\u30ea\u30fc\u30b9\u3057\u307e\u3057\u305f(Phoronix\u3001The GitHub Blog)\u3002 Git v2.36.0\u306f [&hellip;]<\/p>\n","protected":false},"author":2,"featured_media":96985,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"swell_btn_cv_data":"","footnotes":""},"categories":[75],"tags":[159],"class_list":["post-96983","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\/96983","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=96983"}],"version-history":[{"count":0,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/posts\/96983\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/media\/96985"}],"wp:attachment":[{"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/media?parent=96983"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/categories?post=96983"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/softantenna.com\/blog\/wp-json\/wp\/v2\/tags?post=96983"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}