{"id":4581,"date":"2023-02-28T14:41:43","date_gmt":"2023-02-28T05:41:43","guid":{"rendered":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/?p=4581"},"modified":"2023-02-28T14:41:43","modified_gmt":"2023-02-28T05:41:43","slug":"my-favorite-git-commands","status":"publish","type":"post","link":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/2023\/02\/28\/my-favorite-git-commands\/","title":{"rendered":"DWS\u5165\u793e\u5f8c\u3001\u79c1\u304c\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u305fGit\u30b3\u30de\u30f3\u30c9"},"content":{"rendered":"<div id=\"rtoc-mokuji-wrapper\" class=\"rtoc-mokuji-content frame4 preset5 animation-slide rtoc_open noto-sans\" data-id=\"4581\" data-theme=\"DWS BLOG 2023\">\n\t\t\t<div id=\"rtoc-mokuji-title\" class=\" rtoc_left\">\n\t\t\t<button class=\"rtoc_open_close rtoc_open\"><\/button>\n\t\t\t<span>\u76ee\u6b21<\/span>\n\t\t\t<\/div><ol class=\"rtoc-mokuji decimal_ol level-1\"><li class=\"rtoc-item\"><a href=\"#rtoc-1\">\u306f\u3058\u3081\u306b<\/a><\/li><li class=\"rtoc-item\"><a href=\"#rtoc-2\">DWS\u5165\u793e\u524d<\/a><\/li><li class=\"rtoc-item\"><a href=\"#rtoc-3\">DWS\u5165\u793e\u5f8c<\/a><\/li><li class=\"rtoc-item\"><a href=\"#rtoc-4\">\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u30b3\u30de\u30f3\u30c95\u9078<\/a><ol class=\"rtoc-mokuji mokuji_ol level-2\"><li class=\"rtoc-item\"><a href=\"#rtoc-5\">stash<\/a><\/li><li class=\"rtoc-item\"><a href=\"#rtoc-6\">log<\/a><\/li><li class=\"rtoc-item\"><a href=\"#rtoc-7\">revert<\/a><\/li><li class=\"rtoc-item\"><a href=\"#rtoc-8\">rebase<\/a><\/li><li class=\"rtoc-item\"><a href=\"#rtoc-9\">cherry-pick<\/a><\/li><\/ol><\/li><li class=\"rtoc-item\"><a href=\"#rtoc-10\">\u304a\u308f\u308a\u306b<\/a><\/li><\/ol><\/div><h2 id=\"rtoc-1\" >\u306f\u3058\u3081\u306b<\/h2>\n<p>DWS\u6b74\u304c\u3082\u3046\u3058\u304d9\u30f5\u6708\u306b\u306a\u308bshumpei\u3067\u3059\u3002<\/p>\n<p>\u5f53\u793e\u306e<a href=\"https:\/\/mmmcorp.co.jp\/recruit\">\u63a1\u7528\u30da\u30fc\u30b8<\/a>\u3067\u306fDWS\u3067\u50cd\u304f\u30e1\u30ea\u30c3\u30c8\u306e\u4e00\u3064\u3068\u3057\u3066\u3001\u300c\u201d\u8d85\u5b9f\u8df5\u7684\u201d\u306aAWS\u30b9\u30ad\u30eb\u306e\u7fd2\u5f97\u300d\u3092\u63b2\u3052\u3066\u304a\u308a\u307e\u3059\u304c\u3001\u7fd2\u5f97\u3067\u304d\u308b\u306e\u306fAWS\u30b9\u30ad\u30eb\u306b\u9650\u308a\u307e\u305b\u3093\u3002<br \/>\n\u30b7\u30b9\u30c6\u30e0\u958b\u767a\u30fb\u904b\u7528\u306b\u95a2\u9023\u3059\u308b\u30b9\u30ad\u30eb\u5168\u822c\u3092\u8eab\u306b\u3064\u3051\u308b\u74b0\u5883\u304c\u3042\u308b\u3068\u79c1\u306f\u611f\u3058\u3066\u304a\u308a\u307e\u3059\u3002<br \/>\nDWS\u3067\u306e\u30b9\u30ad\u30eb\u30a2\u30c3\u30d7\u74b0\u5883\u3092\u5c11\u3057\u3067\u3082\u660e\u78ba\u306b\u30a4\u30e1\u30fc\u30b8\u3044\u305f\u3060\u304f\u4e00\u52a9\u3068\u3059\u308b\u305f\u3081\u3001\u672c\u30d6\u30ed\u30b0\u3067\u306fDWS\u5165\u793e\u5f8c\u306b\u79c1\u304c\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u305fGit\u30b3\u30de\u30f3\u30c9\u3092\u7d39\u4ecb\u3044\u305f\u3057\u307e\u3059\u3002<br \/>\n\u3042\u304f\u307e\u3067\u79c1\u500b\u4eba\u306e\u7d4c\u9a13\u30fb\u72b6\u6cc1\u306b\u95a2\u3059\u308b\u8a18\u8ff0\u3068\u306a\u308a\u307e\u3059\u304c\u3001\u540c\u7b49\u306e\u30b9\u30ad\u30eb\u611f\u3067DWS\u3078\u306e\u5165\u793e\u3092\u691c\u8a0e\u3055\u308c\u3066\u3044\u308b\u65b9\u306e\u53c2\u8003\u306b\u306a\u308c\u3070\u5e78\u3044\u3067\u3059\u3002<\/p>\n<h2 id=\"rtoc-2\" >DWS\u5165\u793e\u524d<\/h2>\n<p>\u7d042\u5e74\u9593\u3001\u30d7\u30ed\u30b0\u30e9\u30de\u3068\u3057\u3066\u50cd\u3044\u3066\u3044\u307e\u3057\u305f\u3002<br \/>\nDWS\u5165\u793e\u524d\u306b\u3082\u696d\u52d9\u3067Git\u3092\u4f7f\u3046\u7d4c\u9a13\u306f\u3042\u308a\u307e\u3057\u305f\u304c\u3001\u73fe\u5834\u3067\u7528\u610f\u3055\u308c\u305f\u4f7f\u7528\u30de\u30cb\u30e5\u30a2\u30eb\u306b\u5f93\u3044\u3001\u5909\u66f4\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092add\u30fbcommit\u30fbpush\u3059\u308b\u304f\u3089\u3044\u3057\u304b\u3057\u3066\u3044\u307e\u305b\u3093\u3067\u3057\u305f\u3002<\/p>\n<h2 id=\"rtoc-3\" >DWS\u5165\u793e\u5f8c<\/h2>\n<p>DWS\u5165\u793e\u5f8c\u3001Git\u3067\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u30b3\u30de\u30f3\u30c9\u304c\u30b0\u30c3\u3068\u5897\u3048\u307e\u3057\u305f\u3002<br \/>\n\u305d\u306e\u8981\u56e0\u3092\u79c1\u306a\u308a\u306b\u5206\u6790\u3057\u3066\u307f\u308b\u3068\u30012\u3064\u3042\u308b\u3088\u3046\u306b\u601d\u308f\u308c\u307e\u3059\u3002<\/p>\n<p>1\u3064\u76ee\u306e\u8981\u56e0\u306f\u3001\u540c\u50da\u305f\u3061\u304cGit\u3092\u5f53\u305f\u308a\u524d\u306b\u4f7f\u3044\u3053\u306a\u3057\u3066\u3044\u308b\u74b0\u5883\u304c\u3042\u308b\u3053\u3068\u3067\u3059\u3002<br \/>\nDWS\u5165\u793e\u524d\u306b\u3082Git\u4f7f\u7528\u7d4c\u9a13\u304c\u3042\u308b\u3068\u66f8\u304d\u307e\u3057\u305f\u304c\u3001\u79c1\u304c\u53c2\u753b\u3057\u3066\u3044\u305f\u73fe\u5834\u3067\u306f\u5143\u3005Subversion\u3092\u4f7f\u7528\u3057\u3066\u304a\u308a\u3001\u79c1\u306e\u53c2\u753b\u4e2d\u306bGit\u306b\u79fb\u884c\u3057\u305f\u3001\u3068\u3044\u3046\u72b6\u6cc1\u3067\u3057\u305f\u3002<br \/>\n\u73fe\u5834\u3067\u306fGit\u306e\u4f7f\u7528\u306b\u4e0d\u6163\u308c\u306a\u4eba\u304c\u307b\u3068\u3093\u3069\u3067\u3057\u305f\u306e\u3067\u3001\u591a\u304f\u306e\u30d7\u30ed\u30b0\u30e9\u30de\u306f\u6709\u8b58\u8005\u304c\u4f5c\u6210\u3057\u305f\u30de\u30cb\u30e5\u30a2\u30eb\u306b\u6cbf\u3063\u3066\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u3066\u3044\u305f\u3088\u3046\u306b\u601d\u3044\u307e\u3059\uff08\u306a\u306e\u3067\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306a\u3069\u306e\u30a4\u30ec\u30ae\u30e5\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u3068\u3001\u591a\u304f\u306e\u5834\u5408\u305d\u306e\u6709\u8b58\u8005\u306b\u554f\u3044\u5408\u308f\u305b\u304c\u98db\u3076\u3088\u3046\u306a\u72b6\u6cc1\u3067\u3057\u305f\uff09\u3002<br \/>\n\u4ed6\u65b9\u3001DWS\u3067\u306fGit\u3092\u5f53\u305f\u308a\u524d\u306b\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002<br \/>\n\u307e\u305f\u3001\u30b3\u30df\u30c3\u30c8\u306e\u7c92\u5ea6\u3084\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u30d9\u30b9\u30c8\u30d7\u30e9\u30af\u30c6\u30a3\u30b9\u306a\u3069\u3001Git\u904b\u7528\u30eb\u30fc\u30eb\u304c\u793e\u5185wiki\u306b\u307e\u3068\u3081\u3089\u308c\u3066\u304a\u308a\u3001\u5165\u793e\u6642\u306b\u306f\u305d\u308c\u3092\u8aad\u3093\u3067\u7406\u89e3\u3059\u308b\u3053\u3068\u304c\u6c42\u3081\u3089\u308c\u307e\u3059\u3002<\/p>\n<p>2\u3064\u76ee\u306e\u8981\u56e0\u306f\u3001\u30b7\u30b9\u30c6\u30e0\u306e\u958b\u767a\u304b\u3089\u30c7\u30d7\u30ed\u30a4\u307e\u3067\u3001\u5e45\u5e83\u3044\u696d\u52d9\u306b\u643a\u308f\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u3053\u3068\u3067\u3059\u3002<br \/>\nDWS\u5165\u793e\u524d\u306b\u53c2\u753b\u3057\u3066\u3044\u305f\u73fe\u5834\u3067\u306f\u3001\u81ea\u5206\u304c\u62c5\u5f53\u3059\u308b\u306e\u306f\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u307e\u3067\u3067\u3001\u691c\u8a3c\u74b0\u5883\u3084\u672c\u756a\u74b0\u5883\u3078\u306e\u30c7\u30d7\u30ed\u30a4\u306f\u304a\u5ba2\u69d8\u304c\u5b9f\u65bd\u3059\u308b\u3068\u3044\u3046\u5206\u696d\u4f53\u5236\u3067\u3057\u305f\u3002<br \/>\n\u4ed6\u65b9\u3001DWS\u5165\u793e\u5f8c\u306b\u30a2\u30b5\u30a4\u30f3\u3055\u308c\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u30c7\u30d7\u30ed\u30a4\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3\u3082\u4efb\u305b\u3066\u3044\u305f\u3060\u3044\u3066\u3044\u307e\u3059\u3002<br \/>\n\u305d\u306e\u969b\u306b\u3001\u3042\u308b\u7279\u5b9a\u306e\u5909\u66f4\u3060\u3051\u3092\u30c7\u30d7\u30ed\u30a4\u3059\u308b\u5fc5\u8981\u3084\u3001\u4e00\u5ea6\u30c7\u30d7\u30ed\u30a4\u3057\u305f\u3051\u308c\u3069\u3082\u5143\u306b\u623b\u3059\u5fc5\u8981\u304c\u767a\u751f\u3059\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002<br \/>\n\u3053\u3046\u3044\u3063\u305f\u30b1\u30fc\u30b9\u306b\u5bfe\u5fdc\u3059\u308b\u4e2d\u3067\u3001\u5f8c\u8ff0\u3059\u308bcherry-pick\u3084revert\u3068\u3044\u3063\u305fGit\u30b3\u30de\u30f3\u30c9\u3092\u7fd2\u5f97\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3057\u305f\u3002<\/p>\n<p>\u4ee5\u4e0a\uff12\u3064\u306e\u8981\u56e0\u304b\u3089\u3001\u5165\u793e\u524d\u3068\u6bd4\u3079\u3066\u591a\u5c11\u306a\u308a\u3068\u3082Git\u3092\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u3068\u8003\u3048\u3066\u3044\u307e\u3059\u3002<br \/>\n\u958b\u767a\u30c4\u30fc\u30eb\u306e\u4f7f\u7528\u6cd5\u542b\u3081\u3001\u6280\u8853\u529b\u5411\u4e0a\u306e\u305f\u3081\u306b\u306f\u500b\u4eba\u306e\u610f\u5fd7\u3084\u696d\u52d9\u5916\u3067\u306e\u81ea\u5df1\u7814\u947d\u3082\u5fc5\u8981\u3067\u306f\u3042\u308a\u307e\u3059\u304c\u3001\u50cd\u304f\u74b0\u5883\u306b\u3088\u3063\u3066\u3082\u5927\u304d\u304f\u5de6\u53f3\u3055\u308c\u308b\u3053\u3068\u306f\u4e8b\u5b9f\u3068\u601d\u3044\u307e\u3059\u3002<br \/>\n\u305d\u306e\u70b9\u3001DWS\u306e\u74b0\u5883\u306f\u6075\u307e\u308c\u3066\u3044\u308b\u3088\u3046\u306b\u601d\u3044\u307e\u3059\u3002<\/p>\n<p>\u3055\u3066\u3001\u4ee5\u4e0b\u3067\u306f\u3001\u79c1\u304cDWS\u3067\u50cd\u304f\u4e2d\u3067\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u5177\u4f53\u7684\u306aGit\u30b3\u30de\u30f3\u30c9\u30925\u3064\u7d39\u4ecb\u3044\u305f\u3057\u307e\u3059\u3002<\/p>\n<h2 id=\"rtoc-4\" >\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u30b3\u30de\u30f3\u30c95\u9078<\/h2>\n<p>\u8aac\u660e\u306e\u305f\u3081\u306b<code>git-sample<\/code>\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u305d\u306e\u5185\u90e8\u306b<code>file-a.txt<\/code>\u30fb<code><code>file-b.txt<\/code><\/code>\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002<\/p>\n<pre><code>git-sample\n\u251c\u2500\u2500 file-a.txt\n\u2514\u2500\u2500 file-b.txt<\/code><\/pre>\n<p>\u3053\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u914d\u4e0b\u3092Git\u7ba1\u7406\u4e0b\u306b\u7f6e\u304d\u3001main\u3068dev\u306e2\u3064\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002<\/p>\n<h3 id=\"rtoc-5\" >stash<\/h3>\n<p><code>git stash<\/code>\u306f\u672a\u30b3\u30df\u30c3\u30c8\u306e\u5909\u66f4\u3092\u9000\u907f\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<br \/>\n\u79c1\u304c\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u3088\u304f\u4f7f\u3046\u306e\u306f\u3001\u958b\u767a\u7528\u306e\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u5909\u66f4\u3092\u52a0\u3048\u3066\u3044\u308b\u3064\u3082\u308a\u304c\u3046\u3063\u304b\u308amain\u30d6\u30e9\u30f3\u30c1\uff08master\u30d6\u30e9\u30f3\u30c1\uff09\u4e0a\u3067\u4f5c\u696d\u3057\u3066\u3057\u307e\u3063\u3066\u3044\u305f\u3001\u3068\u3044\u3063\u305f\u30b1\u30fc\u30b9\u306b\u304a\u3044\u3066\u3067\u3059\u3002<br \/>\n\u305f\u3068\u3048\u3070\u3001main\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067file-a.txt\u3092\u5909\u66f4\u3057\u3066\u3057\u307e\u3063\u305f\u3068\u3057\u307e\u3059\u3002<\/p>\n<pre><code>% git status\nOn branch main\nChanges not staged for commit:\n  (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)\n  (use &quot;git restore &lt;file&gt;...&quot; to discard changes in working directory)\n        modified:   file-a.txt\n\nno changes added to commit (use &quot;git add&quot; and\/or &quot;git commit -a&quot;)<\/code><\/pre>\n<p>\u3053\u3053\u3067<code>git stash<\/code>\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001file-a.txt\u306b\u5bfe\u3059\u308b\u5909\u66f4\u3092main\u30d6\u30e9\u30f3\u30c1\u4e0a\u304b\u3089\u9000\u907f\u3055\u305b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code>% git stash\nSaved working directory and index state WIP on main: d473eb5 [add]file-b.txt\u3092\u65b0\u898f\u4f5c\u6210\n\n% git status\nOn branch main\nnothing to commit, working tree clean<\/code><\/pre>\n<p>\u3053\u306e\u72b6\u614b\u3067dev\u30d6\u30e9\u30f3\u30c1\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3066<code>git stash apply<\/code>\u3068\u3059\u308b\u3068\u3001\u5148\u307b\u3069\u9000\u907f\u3055\u305b\u305f\u5909\u66f4\u3092dev\u30d6\u30e9\u30f3\u30c1\u306b\u53cd\u6620\u3055\u305b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code>% git checkout dev\nSwitched to branch &#039;dev&#039;\n\n% git status\nOn branch dev\nnothing to commit, working tree clean\n\n% git stash apply\nOn branch dev\nChanges not staged for commit:\n  (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)\n  (use &quot;git restore &lt;file&gt;...&quot; to discard changes in working directory)\n        modified:   file-a.txt\n\nno changes added to commit (use &quot;git add&quot; and\/or &quot;git commit -a&quot;)<\/code><\/pre>\n<h3 id=\"rtoc-6\" >log<\/h3>\n<p>\u5f8c\u3067\u7d39\u4ecb\u3059\u308brevert\u30fbcherry-pick\u3092\u4f7f\u7528\u3059\u308b\u524d\u306b\u3088\u304f\u4f7f\u3046\u306e\u304c\u3001<code>git log<\/code>\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<br \/>\n\u305d\u306e\u540d\u306e\u901a\u308a\u3001\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002<br \/>\n\u4ee5\u4e0b\u3067\u306f\u3001dev\u30d6\u30e9\u30f3\u30c1\u3067\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u3066\u3044\u307e\u3059\uff08<code>--oneline<\/code>\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u308b\u30681\u30b3\u30df\u30c3\u30c81\u884c\u3067\u8868\u793a\u3055\u308c\u307e\u3059\uff09\u3002<\/p>\n<pre><code>% git log --oneline\n9685ed8 (HEAD -&gt; dev) [fix]file-a.txt\u306e\u4fee\u6b633\n3086831 [fix]file-a.txt\u306e\u4fee\u6b632\n9a1d825 [fix]file-b.txt\u306e\u4fee\u6b631\nd5404a9 [fix]file-a.txt\u306e\u4fee\u6b631\nd473eb5 (main) [add]file-b.txt\u3092\u65b0\u898f\u4f5c\u6210\n03a827c [add]file-a.txt\u3092\u65b0\u898f\u4f5c\u6210\n60f6efe first commit<\/code><\/pre>\n<h3 id=\"rtoc-7\" >revert<\/h3>\n<p><code>git revert<\/code>\u306f\u30b3\u30df\u30c3\u30c8\u6e08\u307f\u306e\u5909\u66f4\u3092\u6253\u3061\u6d88\u3059\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<br \/>\n\u305f\u3068\u3048\u3070\u3001\u300c[fix]file-b.txt\u306e\u4fee\u6b631\u300d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6253\u3061\u6d88\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4e0a\u8a18\u306e<code>git log<\/code>\u3067\u8abf\u3079\u305f\u30b3\u30df\u30c3\u30c8ID\u3092\u5143\u306b\u3001\u6b21\u306e\u3088\u3046\u306b\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002<\/p>\n<pre><code>git revert 9a1d825<\/code><\/pre>\n<p>\u3059\u308b\u3068\u3001\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u304cvi\u30a8\u30c7\u30a3\u30bf\u3067\u8868\u793a\u3055\u308c\u307e\u3059\u3002<\/p>\n<pre><code>Revert &quot;[fix]file-b.txt\u306e\u4fee\u6b631&quot;\n\nThis reverts commit 9a1d825d9357acc12264764aa3d1ff0c73b5aea0.\n\n# Please enter the commit message for your changes. Lines starting\n# with &#039;#&#039; will be ignored, and an empty message aborts the commit.\n#\n# On branch dev\n# Changes to be committed:\n#       modified:   file-b.txt\n#<\/code><\/pre>\n<p>\u4eca\u56de\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3067\u4fdd\u5b58\u3057\u307e\u3059\u3002<br \/>\n\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u78ba\u8a8d\u3059\u308b\u3068\u3001revert\u30b3\u30df\u30c3\u30c8\u304c\u8ffd\u52a0\u3055\u308c\u305f\u3053\u3068\u304c\u5206\u304b\u308a\u307e\u3059\u3002<\/p>\n<pre><code>% git log --oneline\ne18e316 (HEAD -&gt; dev) Revert &quot;[fix]file-b.txt\u306e\u4fee\u6b631&quot;\n9685ed8 [fix]file-a.txt\u306e\u4fee\u6b633\n3086831 [fix]file-a.txt\u306e\u4fee\u6b632\n9a1d825 [fix]file-b.txt\u306e\u4fee\u6b631\nd5404a9 [fix]file-a.txt\u306e\u4fee\u6b631\nd473eb5 (main) [add]file-b.txt\u3092\u65b0\u898f\u4f5c\u6210\n03a827c [add]file-a.txt\u3092\u65b0\u898f\u4f5c\u6210\n60f6efe first commit<\/code><\/pre>\n<h3 id=\"rtoc-8\" >rebase<\/h3>\n<p><code>git rebase<\/code>\u306f\u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u30921\u3064\u306b\u307e\u3068\u3081\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<br \/>\n\u4eca\u56de\u306f\u300c[fix]file-a.txt\u306e\u4fee\u6b633\u300d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u300c[fix]file-a.txt\u306e\u4fee\u6b632\u300d\u306b\u307e\u3068\u3081\u3066\u307f\u307e\u3059\u3002<br \/>\n\u30b3\u30de\u30f3\u30c9\u5b9f\u884c\u6642\u306b\u8d77\u70b9\u3068\u306a\u308b\u30b3\u30df\u30c3\u30c8\uff08\u300c[fix]file-a.txt\u306e\u4fee\u6b632\u300d\uff09\u306e\uff11\u3064\u524d\u306e\u30b3\u30df\u30c3\u30c8\uff08\u300c [fix]file-b.txt\u306e\u4fee\u6b631\u300d\uff09\u306eID\u3092\u63a7\u3048\u3066\u304a\u304d\u3001\u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002<\/p>\n<pre><code>% git rebase -i 9a1d825<\/code><\/pre>\n<p>\u3059\u308b\u3068\u3001\u6b21\u306e\u3088\u3046\u306a\u6587\u8a00\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002<\/p>\n<pre><code>pick 3086831 [fix]file-a.txt\u306e\u4fee\u6b632\npick 9685ed8 [fix]file-a.txt\u306e\u4fee\u6b633\npick e18e316 Revert &quot;[fix]file-b.txt\u306e\u4fee\u6b631&quot;<\/code><\/pre>\n<p>\u3053\u308c\u3092\u6b21\u306e\u3088\u3046\u306b\u66f8\u304d\u63db\u3048\u307e\u3059\u3002<\/p>\n<pre><code>pick 3086831 [fix]file-a.txt\u306e\u4fee\u6b632\nsquash 9685ed8 [fix]file-a.txt\u306e\u4fee\u6b633\npick e18e316 Revert &quot;[fix]file-b.txt\u306e\u4fee\u6b631&quot;<\/code><\/pre>\n<p>\u4fdd\u5b58\u3059\u308b\u3068\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u7de8\u96c6\u30a8\u30c7\u30a3\u30bf\u304c\u7acb\u3061\u4e0a\u304c\u308a\u307e\u3059\u3002<br \/>\n\u4eca\u56de\u306f\u6b21\u306e\u3088\u3046\u306a\u6587\u8a00\u306b\u7de8\u96c6\u3057\u307e\u3057\u305f\u3002<\/p>\n<pre><code># This is a combination of 2 commits.\n# This is the 1st commit message:\n\n[fix]file-a.txt\u306e\u4fee\u6b632\u30fb3<\/code><\/pre>\n<p>\u4fdd\u5b58\u3059\u308b\u3068\u3001<\/p>\n<pre><code>% git rebase -i 9a1d825\n[detached HEAD 923f02a] [fix]file-a.txt\u306e\u4fee\u6b632\u30fb3\n Date: Tue Feb 21 12:10:59 2023 +0900\n 1 file changed, 2 insertions(+)\nSuccessfully rebased and updated refs\/heads\/dev.<\/code><\/pre>\n<p>\u3068\u30b3\u30f3\u30bd\u30fc\u30eb\u306b\u8868\u793a\u3055\u308c\u3001rebase\u306b\u6210\u529f\u3057\u305f\u3053\u3068\u304c\u5206\u304b\u308a\u307e\u3059\u3002<br \/>\n\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3082\u66f8\u304d\u5909\u308f\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<pre><code>% git log --oneline\n1a766fa (HEAD -&gt; dev) Revert &quot;[fix]file-b.txt\u306e\u4fee\u6b631&quot;\n923f02a [fix]file-a.txt\u306e\u4fee\u6b632\u30fb3\n9a1d825 [fix]file-b.txt\u306e\u4fee\u6b631\nd5404a9 [fix]file-a.txt\u306e\u4fee\u6b631\nd473eb5 (main) [add]file-b.txt\u3092\u65b0\u898f\u4f5c\u6210\n03a827c [add]file-a.txt\u3092\u65b0\u898f\u4f5c\u6210\n60f6efe first commit<\/code><\/pre>\n<h3 id=\"rtoc-9\" >cherry-pick<\/h3>\n<p><code>git cherry-pick<\/code>\u3092\u4f7f\u3046\u3068\u3001\u4ed6\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u7279\u5b9a\u30b3\u30df\u30c3\u30c8\u306e\u307f\u3092\u53d6\u308a\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<br \/>\n\u30c7\u30d7\u30ed\u30a4\u6642\u306b\u3001\u958b\u767a\u30d6\u30e9\u30f3\u30c1\u3092main\u3084release\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u3066\u3057\u307e\u3046\u3068\u4f59\u8a08\u306a\u5909\u66f4\u307e\u3067\u542b\u307e\u308c\u3066\u3057\u307e\u3046\u30b1\u30fc\u30b9\u3067\u4f7f\u3046\u3053\u3068\u304c\u591a\u3044\u3067\u3059\u3002<br \/>\n\u4eca\u56de\u306f\u3001dev\u30d6\u30e9\u30f3\u30c1\u3067\u5b9f\u65bd\u3057\u305f\u300c[fix]file-a.txt\u306e\u4fee\u6b631\u300d\u3092main\u30d6\u30e9\u30f3\u30c1\u306b\u53d6\u308a\u8fbc\u3093\u3067\u307f\u307e\u3059\u3002<br \/>\n\u3053\u306e\u4fee\u6b63\u306e\u30b3\u30df\u30c3\u30c8ID\u3092\u63a7\u3048\u305f\u306e\u3061\u3001main\u30d6\u30e9\u30f3\u30c1\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u307e\u3059\u3002<\/p>\n<pre><code>% git checkout main\nSwitched to branch &#039;main&#039;<\/code><\/pre>\n<p>\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u78ba\u8a8d\u3059\u308b\u3068\u3001\u307e\u3060dev\u30d6\u30e9\u30f3\u30c1\u3067\u5b9f\u65bd\u3057\u305f\u4fee\u6b63\u306f\u53cd\u6620\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002<\/p>\n<pre><code>% git log --oneline\nd473eb5 (HEAD -&gt; main) [add]file-b.txt\u3092\u65b0\u898f\u4f5c\u6210\n03a827c [add]file-a.txt\u3092\u65b0\u898f\u4f5c\u6210\n60f6efe first commit<\/code><\/pre>\n<p>cherry-pick\u3057\u3066\u307f\u307e\u3059\u3002<\/p>\n<pre><code>% git cherry-pick d5404a9\n[main a75b68e] [fix]file-a.txt\u306e\u4fee\u6b631\n Date: Tue Feb 21 12:09:30 2023 +0900\n 1 file changed, 1 insertion(+)<\/code><\/pre>\n<p>\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u304b\u3089\u3082\u3001\u300c[fix]file-a.txt\u306e\u4fee\u6b631\u300d\u306e\u307f\u304c\u53d6\u308a\u8fbc\u307e\u308c\u305f\u3053\u3068\u3092\u78ba\u8a8d\u3067\u304d\u307e\u3057\u305f\u3002<\/p>\n<pre><code>% git log --oneline      \na75b68e (HEAD -&gt; main) [fix]file-a.txt\u306e\u4fee\u6b631\nd473eb5 [add]file-b.txt\u3092\u65b0\u898f\u4f5c\u6210\n03a827c [add]file-a.txt\u3092\u65b0\u898f\u4f5c\u6210\n60f6efe first commit<\/code><\/pre>\n<h2 id=\"rtoc-10\" >\u304a\u308f\u308a\u306b<\/h2>\n<p>\u4eca\u56de\u7d39\u4ecb\u3059\u308bGit\u30b3\u30de\u30f3\u30c9\u306f\u4ee5\u4e0a\u3067\u3059\u3002<br \/>\n\u3054\u304f\u57fa\u672c\u7684\u306a\u30b3\u30de\u30f3\u30c9\u3070\u304b\u308a\u3060\u3063\u305f\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u304c\u3001\u3053\u308c\u3089\u3092\u4f7f\u3048\u306a\u304b\u3063\u305f\u3053\u3068\u3092\u7b11\u308f\u308c\u305f\u308a\u99ac\u9e7f\u306b\u3055\u308c\u305f\u308a\u3068\u3044\u3063\u305f\u3053\u3068\u306fDWS\u5165\u793e\u4ee5\u6765\u306a\u304b\u3063\u305f\u306e\u3067\u3001\u4eca\u306f\u307e\u3060\u30b9\u30ad\u30eb\u306b\u81ea\u4fe1\u304c\u306a\u304f\u3066\u3082\u5b89\u5fc3\u3057\u3066\u529b\u3092\u4f38\u3070\u3057\u3066\u3044\u3051\u308b\u4f1a\u793e\u3068\u611f\u3058\u3066\u3044\u307e\u3059\u3002<br \/>\n\u5f53\u793e\u3078\u306e\u5fdc\u52df\u3092\u691c\u8a0e\u3055\u308c\u3066\u3044\u308b\u65b9\u306e\u3054\u53c2\u8003\u306b\u306a\u308a\u307e\u3057\u305f\u3089\u5e78\u3044\u3067\u3059\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u76ee\u6b21 \u306f\u3058\u3081\u306bDWS\u5165\u793e\u524dDWS\u5165\u793e\u5f8c\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u30b3\u30de\u30f3\u30c95\u9078stashlogrevertrebasecherry-pick\u304a\u308f\u308a\u306b\u306f\u3058\u3081\u306b DWS\u6b74\u304c\u3082\u3046\u3058\u304d9\u30f5\u6708\u306b\u306a\u308bshumpei\u3067\u3059\u3002 \u5f53\u793e\u306e\u63a1\u7528\u30da\u30fc\u30b8\u3067\u306f [&hellip;]<\/p>\n","protected":false},"author":2,"featured_media":4645,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jinr_url_youtube":"","_jinr_pip_youtube":false,"_jinr_time_youtube":"","_jinr_thumb_youtube":"","_jinr_media_youtube":"","_jinr_category_edit":false,"_jinr_category":"","_jinr_title_display":false,"_jinr_snsbutton_display":false,"_jinr_ads_display":false,"_jinr_thumbnail_display":false,"_jinr_profile_display":false,"_jinr_relatedpost_display":false,"_jinr_sidebar1col_display":false,"_jinr_sidebar2col_display":false,"_jinr_seotitle_display":"","_jinr_description_display":"","_jinr_keyword_display":"","_jinr_hastag_display":"","_jinr_canonical_display":"","_jinr_noindex_display":false,"_jinr_paidpost":false,"_jinr_paidpost_product_id":"","_jinr_headtag_article":""},"categories":[1],"tags":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/posts\/4581"}],"collection":[{"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/comments?post=4581"}],"version-history":[{"count":0,"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/posts\/4581\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/"}],"wp:attachment":[{"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/media?parent=4581"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/categories?post=4581"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/cms-mordpress.test.mmmcorp.co.jp\/wp-json\/wp\/v2\/tags?post=4581"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}