{"id":37252,"date":"2022-12-08T04:40:32","date_gmt":"2023-07-16T12:38:06","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/"},"modified":"2024-04-29T04:15:17","modified_gmt":"2024-04-28T20:15:17","slug":"%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/","title":{"rendered":"\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f"},"content":{"rendered":"<h2>\u4f7f\u7528git merge\u547d\u4ee4\u5c06bugFix\u5206\u652f\u5408\u5e76\u5230main\u5206\u652f\u7684\u6d41\u7a0b\u3002<\/h2>\n<p>\u7528\u201cbugFix\u201d\u4f5c\u4e3a\u540d\u79f0\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f<\/p>\n<pre class=\"post-pre\"><code>git branch bugFix\r\n<\/code><\/pre>\n<p>\u4f7f\u7528git checkout bugFix\u547d\u4ee4\u5207\u6362\u5230bugFix\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code>git checkout bugFix\r\n<\/code><\/pre>\n<p>\u53ea\u63d0\u4ea4\u4e00\u6b21<\/p>\n<pre class=\"post-pre\"><code>git commit\r\n<\/code><\/pre>\n<p>\u4f7f\u7528git checkout\u547d\u4ee4\u5207\u6362\u5230main\u5206\u652f<\/p>\n<pre class=\"post-pre\"><code>git checkout main\r\n\r\n<\/code><\/pre>\n<p>\u518d\u6b21\u63d0\u4ea4<\/p>\n<pre class=\"post-pre\"><code>git commit\r\n<\/code><\/pre>\n<p>\u4f7f\u7528git merge\u547d\u4ee4\u5c06bugFix\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652fmain\u3002<\/p>\n<pre class=\"post-pre\"><code>git merge bugFix\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/13-0.png\" alt=\"image.png\" \/><\/div>\n<h2>\u4f7f\u7528\u7684\u8a5e\u5f59<\/h2>\n<h3>\u6807\u9898<\/h3>\n<p>HEAD\uff08\u4e3b\u8981\u5206\u652f\uff09\u662f\u6307\u5f53\u524d\u88ab\u68c0\u51fa\u7684\u63d0\u4ea4\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u5b83\u8868\u793a\u5f53\u524d\u6b63\u5728\u8fdb\u884c\u7684\u63d0\u4ea4\u3002<br \/>\nHEAD\u59cb\u7ec8\u6307\u5411\u6d3b\u52a8\u6811\u4e2d\u6700\u65b0\u7684\u63d0\u4ea4\u3002\u8bb8\u591a\u4fee\u6539\u5de5\u4f5c\u6811\u7684git\u547d\u4ee4\u9996\u5148\u4eceHEAD\u5f00\u59cb\u5904\u7406\u3002<br \/>\n\u901a\u5e38\uff0cHEAD\u6307\u5411\u4e00\u4e2a\u5206\u652f\u540d\u79f0\uff08\u4f8b\u5982\uff0cbugFix\uff09\u3002\u5f53\u63d0\u4ea4\u540e\uff0cbugFix\u7684\u72b6\u6001\u5c06\u4f1a\u53d8\u5316\uff0c\u5e76\u4e14\u8be5\u53d8\u5316\u53ef\u4ee5\u4eceHEAD\u4e2d\u67e5\u770b\u5230\u3002<\/p>\n<p>HEAD\u7684\u5206\u79bb\uff08detached HEAD\uff09\u662f\u6307\u5c06HEAD\u7ed1\u5b9a\u5230\u7279\u5b9a\u63d0\u4ea4\u800c\u4e0d\u662f\u5206\u652f\u3002\u8981\u5c06\u5176\u7ed1\u5b9a\u5230\u7279\u5b9a\u63d0\u4ea4\uff0c\u9700\u8981\u4f7f\u7528\u63d0\u4ea4\u7684\u54c8\u5e0c\u6307\u5b9a\u3002\u8981\u67e5\u770b\u54c8\u5e0c\u503c\uff0c\u53ef\u4ee5\u4f7f\u7528git log\u547d\u4ee4\u3002<br \/>\n\u4f8b\u5982\uff0cfed2da64c0efc5293610bdd892f82a58e8cbc5d8<br \/>\n\u6709\u4e00\u79cd\u7b80\u4fbf\u7684\u65b9\u6cd5\u6765\u6307\u5b9a\u63d0\u4ea4\u3002\u53ea\u9700\u8f93\u5165\u8db3\u591f\u957f\u7684\u54c8\u5e0c\u503c\u4ee5\u786e\u4fdd\u5176\u552f\u4e00\u6027\uff0c\u5373\u53ef\u66ff\u6362\u4e0a\u8ff0\u957f\u5b57\u7b26\u4e32\u4e3afed2\u3002<\/p>\n<h3>\u5bf9\u4e8e&#8221;\u76f8\u5bfe\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9&#8221;\u8fd9\u4e2a\u8bcd\uff0c\u6709\u4e00\u4e2a\u53ef\u80fd\u7684\u4e2d\u6587\u7ffb\u8bd1\u662f&#8221;\u76f8\u5bf9\u53c2\u7167&#8221;\u3002<\/h3>\n<p>\u901a\u8fc7\u4f7f\u7528\u76f8\u5bf9\u53c2\u7167\uff0c\u5728\u5bb9\u6613\u8bb0\u5fc6\u7684\u4f4d\u7f6e\uff08\u5982bugFix\u5206\u652f\u6216HEAD\uff09\u5f00\u59cb\uff0c\u5e76\u53ef\u4ee5\u4ece\u90a3\u4e2a\u4f4d\u7f6e\u6307\u5b9a\u76f8\u5bf9\u4f4d\u7f6e\u3002<\/p>\n<p>1. \u9010\u4e2a\u5411\u4e0a\u79fb\u52a8\uff08\u5c16\u53f7\uff09- \u5f53\u5411\u53c2\u8003\u540d\u79f0\u6dfb\u52a0\u5c16\u53f7\u540e\uff0c\u5373\u5411git\u53d1\u9001\u6307\u4ee4\u4ee5\u627e\u5230\u6307\u5b9a\u63d0\u4ea4\u7684\u7236\u63d0\u4ea4\u3002<\/p>\n<p>\u6240\u4ee5\uff0c\u5982\u679c\u4f60\u5199\u6210 main^\uff0c\u5c31\u8868\u793a\u201cmain\u7684\u4e0a\u4e00\u4e2a\u7236\u7ea7\u201d\uff0c\u610f\u601d\u5c31\u662f\u8fd9\u6837\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/22-0.png\" alt=\"image.png\" \/><\/div>\n<p>\u8981\u68c0\u51fabugFix\u7684\u7236\u63d0\u4ea4<\/p>\n<pre class=\"post-pre\"><code>git checkout bugFix^\r\n<\/code><\/pre>\n<p>2. &#8220;\u301c&#8221; \u6f14\u7b97\u5b50\u7528\u4e8e\u5728\u63d0\u4ea4\u6811\u4e2d\u8fdb\u884c\u591a\u7ea7\u8df3\u8f6c\u3002\u5728\u6ce2\u6d6a\u7ebf\u6f14\u7b97\u5b50\u540e\u9762\uff0c\u8fd8\u53ef\u4ee5\u7528\u4e00\u4e2a\u6570\u5b57\u4f5c\u4e3a\u9009\u9879\uff0c\u8868\u793a\u8981\u5411\u4e0a\u79fb\u52a8\u7684\u7236\u63d0\u4ea4\u7684\u6570\u91cf\u3002<\/p>\n<pre class=\"post-pre\"><code>git checkout HEAD~4\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/27-0.png\" alt=\"image.png\" \/><\/div>\n<h3>\u5f3a\u5236\u5206\u652f\u9009\u9879<\/h3>\n<p>\u5e38\u89c1\u7684\u76f8\u5bf9\u5f15\u7528\u7528\u6cd5\u4e4b\u4e00\u662f\u5206\u652f\u79fb\u52a8\u3002\u60a8\u53ef\u4ee5\u4f7f\u7528-f\u9009\u9879\u5c06\u5206\u652f\u76f4\u63a5\u5173\u8054\u5230\u63d0\u4ea4\u4e0a\u3002\u5982\u4e0b\u6240\u793a\uff1a<\/p>\n<pre class=\"post-pre\"><code>git branch -f main HEAD~3\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/31-1.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git branch main C6\r\n<\/code><\/pre>\n<pre class=\"post-pre\"><code>git checkout HEAD~1\r\n<\/code><\/pre>\n<pre class=\"post-pre\"><code>git branch -f bugFix HEAD~1\r\n   or\r\ngit branch -f bugFix C0\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/35-0.png\" alt=\"image.png\" \/><\/div>\n<h3>\u64a4\u9500\u6539\u52a8 git reset | git Revert<\/h3>\n<pre class=\"post-pre\"><code>git reset HEAD~1\r\n<\/code><\/pre>\n<p>git reset\u901a\u8fc7\u5c06\u5206\u652f\u6307\u9488\u5411\u540e\u79fb\u52a8\u6765\u5b9e\u73b0\u53d6\u6d88\u66f4\u6539\u7684\u529f\u80fd\u3002\u53ef\u4ee5\u5c06\u5176\u89c6\u4e3a\u8986\u76d6\u5386\u53f2\u8bb0\u5f55\u7684\u64cd\u4f5c\u3002<\/p>\n<pre class=\"post-pre\"><code>git revert HEAD\r\n<\/code><\/pre>\n<p>\u4e3a\u4e86\u64a4\u9500\u66f4\u6539\u5e76\u4e0e\u4ed6\u4eba\u5171\u4eab\uff0c\u9700\u8981\u4f7f\u7528git revert\u3002<\/p>\n<h2>\u5c06\u4ee3\u7801\u79fb\u52a8 git cherry-pick<\/h2>\n<pre class=\"post-pre\"><code>git cherry-pick &lt;Commit1&gt; &lt;Commit2&gt; &lt;...&gt;\r\n<\/code><\/pre>\n<pre class=\"post-pre\"><code>git cherry-pick C2 C4\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/44-1.png\" alt=\"image.png\" \/><\/div>\n<h3>Git \u4e92\u52a8\u53d8\u57fa<\/h3>\n<p>\u5728\u4e0d\u77e5\u9053\u8981\u64cd\u7eb5\u54ea\u4e2a\u63d0\u4ea4\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528Git\u7684\u4ea4\u4e92\u5f0frebase\u3002\u8fd9\u662f\u67e5\u770b\u60f3\u8981rebase\u7684\u4e00\u8fde\u4e32\u63d0\u4ea4\u7684\u6700\u4f73\u65b9\u6cd5\u3002<\/p>\n<p>\u4e92\u52a8\u5f0f\u53d8\u57fa\u4ec5\u662f\u5c06-i\u9009\u9879\u4e0e\u53d8\u57fa\u547d\u4ee4\u7ed3\u5408\u4f7f\u7528\u3002<\/p>\n<p>\u5982\u679c\u542f\u7528\u8be5\u9009\u9879\uff0cgit\u5c06\u6253\u5f00\u4e00\u4e2a\u754c\u9762\uff0c\u663e\u793a\u5c06\u88ab\u590d\u5236\u5230rebase\u76ee\u6807\u4e0b\u7684\u6bcf\u4e2a\u63d0\u4ea4\u3002\u5b83\u8fd8\u4f1a\u663e\u793a\u8fd9\u4e9b\u63d0\u4ea4\u7684\u54c8\u5e0c\u548c\u6d88\u606f\uff0c\u65b9\u4fbf\u4e00\u76ee\u4e86\u7136\u5730\u67e5\u770brebase\u7684\u6982\u8981\u3002<\/p>\n<p>\u5f53\u6253\u5f00\u4ea4\u4e92\u5f0f\u53d8\u57fa\u5bf9\u8bdd\u6846\u65f6\uff0c\u60a8\u53ef\u4ee5\u4ece\u4e09\u4e2a\u64cd\u4f5c\u4e2d\u9009\u62e9\uff1a<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">UI\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u306a\u304b\u3067\u9806\u756a\u3092\u8abf\u6574\u3059\u308b\u3060\u3051\u3067\u30b3\u30df\u30c3\u30c8\u306e\u9806\u756a\u3092\u5909\u3048\u3089\u308c\u307e\u3059\uff08\u3053\u3061\u3089\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3067\u306f\u3001\u30de\u30a6\u30b9\u3067\u30c9\u30e9\u30c3\u30b0\u30a2\u30f3\u30c9\u30c9\u30ed\u30c3\u30d7\u3067\u64cd\u4f5c\u3057\u307e\u3059\uff09\u3002<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">\u7279\u5b9a\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4e38\u3054\u3068\u9664\u304f\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\u9664\u304d\u305f\u3044\u30b3\u30df\u30c3\u30c8\u3092\u6307\u5b9a\u3059\u308b\u306b\u306fpick\u3092\u30aa\u30d5\u306b\u3057\u307e\u3059\u3002<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\u6700\u5f8c\u306b\u3001\u30b3\u30df\u30c3\u30c8\u3092\u7d44\u307f\u5408\u308f\u305b\u3089\u308c\u307e\u3059\u3002\u6280\u8853\u7684\u306b\u5236\u9650\u304c\u3042\u308a\u518d\u73fe\u3067\u304d\u306a\u3044\u306e\u3067\u305d\u306e\u8a73\u7d30\u306a\u8aac\u660e\u3092\u7701\u304d\u307e\u3059\u304c\u3001\u77ed\u304f\u8a00\u3044\u307e\u3059\u3068\u3001\u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4e00\u3064\u306b\u307e\u3068\u3081\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u6a5f\u80fd\u3067\u3059\u3002<\/ul>\n<pre class=\"post-pre\"><code>git rebase -i HEAD~4\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/52-2.png\" alt=\"image.png\" \/><\/div>\n<hr \/>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/54-1.png\" alt=\"image.png\" \/><\/div>\n<h3>\u672c\u5730\u5806\u53e0\u7684\u63d0\u4ea4<\/h3>\n<p>\u5728\u5b9e\u9645\u5f00\u53d1\u4e2d\uff0c\u901a\u5e38\u4f1a\u9047\u5230\u8fd9\u6837\u7684\u60c5\u51b5\uff1a&#8221;\u5c1d\u8bd5\u8c03\u67e5\u9519\u8bef\u7684\u539f\u56e0\uff0c\u4f46\u9519\u8bef\u7684\u518d\u73b0\u6027\u76f8\u5f53\u4f4e\u3002\u4e3a\u4e86\u8f85\u52a9\u8c03\u67e5\uff0c\u63d2\u5165\u4e86\u4e00\u4e9b\u8c03\u8bd5\u6307\u4ee4\u548c\u6253\u5370\u8bed\u53e5\u3002&#8221;<\/p>\n<p>\u8fd9\u4e9b\u7528\u4e8e\u8c03\u8bd5\u7684\u4ee3\u7801\u5df2\u7ecf\u63d0\u4ea4\u5230\u4e86\u7528\u4e8e\u4fee\u590d\u9519\u8bef\u7684\u5206\u652f\u4e0a\u3002\u6700\u7ec8\u627e\u5230\u4e86\u9519\u8bef\u7684\u539f\u56e0\u5e76\u5bf9\u5176\u8fdb\u884c\u4e86\u4fee\u590d\uff01\u592a\u68d2\u4e86\uff01<\/p>\n<p>\u53ea\u8981\u5c06bugFix\u5206\u652f\u5408\u5e76\u5230main\u5206\u652f\u5c31\u53ef\u4ee5\u4e86\u3002\u7b80\u5355\u5730\u8bf4\uff0c\u53ea\u9700\u5c06main\u5206\u652f\u5feb\u8fdb\uff08fast-forward\uff09\u5373\u53ef\u3002\u4f46\u8fd9\u6837\u505a\u4f1a\u5bfc\u81f4\u8c03\u8bd5\u4ee3\u7801\u6df7\u5165\u5230main\u5206\u652f\u4e2d\u3002<br \/>\n\u8fd9\u65f6\u5019\uff0cGit\u7684\u9b54\u6cd5\u5c31\u6d3e\u4e0a\u7528\u573a\u4e86\u3002\u867d\u7136\u89e3\u51b3\u65b9\u6cd5\u6709\u5f88\u591a\u79cd\uff0c\u4f46\u6700\u76f4\u63a5\u7684\u89e3\u51b3\u65b9\u6cd5\u6709\u4e24\u4e2a\uff1a<\/p>\n<pre class=\"post-pre\"><code>git rebase -i\r\ngit cherry-pick\r\n<\/code><\/pre>\n<p>\u901a\u8fc7\u5177\u6709\u4ea4\u4e92\u6a21\u5f0f(-i\u9009\u9879)\u7684rebase\u547d\u4ee4\uff0c\u60a8\u53ef\u4ee5\u9009\u62e9\u4fdd\u7559\u548c\u4e22\u5f03\u7684\u63d0\u4ea4\u3002\u8fd8\u53ef\u4ee5\u6539\u53d8\u63d0\u4ea4\u7684\u987a\u5e8f\u3002\u8fd9\u4e2a\u65b9\u6cd5\u5728\u5e0c\u671b\u5c06\u90e8\u5206\u66f4\u6539\u79fb\u52a8\u5230\u5176\u4ed6\u5730\u65b9\u65f6\u975e\u5e38\u65b9\u4fbf\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/61-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase -i main \r\n<\/code><\/pre>\n<p>git rebase -i main \u547d\u4ee4\u662f\u5728Git\u5b58\u50a8\u5e93\u4e2d\u4f7f\u7528\u7684\u547d\u4ee4\uff0c\u7528\u4e8e\u4ee5\u4ea4\u4e92\u65b9\u5f0f\u91cd\u65b0\u6784\u5efa\u548c\u7f16\u8f91\u7279\u5b9a\u5206\u652f\uff08\u5728\u6b64\u5904\u4e3amain\u5206\u652f\uff09\u7684\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u3002\u8be5\u547d\u4ee4\u7528\u4e8e\u6267\u884c\u201c\u4ea4\u4e92\u5f0f\u53d8\u57fa\u201d\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/64-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase bugFix main\r\n<\/code><\/pre>\n<p>git rebase bugFix main \u662f\u4e00\u4e2a\u5728Git\u4ed3\u5e93\u4e2d\u4f7f\u7528\u7684\u547d\u4ee4\uff0c\u7528\u4e8e\u5c06\u7279\u5b9a\u5206\u652f\uff08\u5728\u8fd9\u91cc\u662f bugFix \u5206\u652f\uff09\u7684\u63d0\u4ea4\u5386\u53f2\u91cd\u65b0\u5e94\u7528\uff08rebase\uff09\u5230\u53e6\u4e00\u4e2a\u5206\u652f\uff08\u5728\u8fd9\u91cc\u662f main \u5206\u652f\uff09\u4e0a\u3002<\/p>\n<p>\u5177\u4f53\u800c\u8a00\uff0c\u91cd\u65b0\u5e94\u7528\u57fa\u4e8emain\u5206\u652f\u4e0a\u6700\u65b0\u63d0\u4ea4\u7684bugFix\u5206\u652f\u4e0a\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u8fd9\u610f\u5473\u7740\u5c06bugFix\u5206\u652f\u7684\u66f4\u6539\u5185\u5bb9\u4e0e\u6700\u65b0\u7684main\u5206\u652f\u66f4\u6539\u96c6\u6210\u5728\u4e00\u8d77\uff0c\u4fdd\u6301\u5e72\u51c0\u7684\u63d0\u4ea4\u5386\u53f2\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/68-0.png\" alt=\"image.png\" \/><\/div>\n<h3>\u7ba1\u7406\u63d0\u4ea4<\/h3>\n<p>\u8ba9\u6211\u4eec\u8003\u8651\u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u7ecf\u5e38\u53d1\u751f\u7684\u60c5\u51b5\u3002\u5047\u8bbe\u6709\u4e24\u4e2a\u66f4\u6539\uff08newImage \u548c caption\uff09\uff0c\u5b83\u4eec\u4e4b\u95f4\u5b58\u5728\u4f9d\u8d56\u5173\u7cfb\u3002\u6211\u4eec\u5047\u8bbe\u8fd9\u4e00\u7cfb\u5217\u66f4\u6539\u90fd\u662f\u6309\u987a\u5e8f\u8fdb\u884c\u7684\u3002<\/p>\n<p>\u5728\u8fd9\u91cc\u68d8\u624b\u7684\u662f\u9700\u8981\u5bf9\u4e4b\u524d\u7684\u63d0\u4ea4\u8fdb\u884c\u5fae\u5c0f\u4fee\u6b63\u7684\u60c5\u51b5\u3002\u5728\u672c\u6b21\u6559\u6750\u4e2d\uff0c\u5047\u8bbe\u5373\u4f7f\u662f\u8fc7\u53bb\u7684\u63d0\u4ea4\uff0c\u4e5f\u5305\u542b\u4e86\u5bf9newImage\u5206\u652f\u8fdb\u884c\u7ec6\u5fae\u4fee\u6539\u7684\u8bbe\u8ba1\u4fee\u6b63\u3002<\/p>\n<p>\u6211\u4eec\u8003\u8651\u901a\u8fc7\u4ee5\u4e0b\u6b65\u9aa4\u514b\u670d\u8fd9\u79cd\u56f0\u96be\u60c5\u51b5\uff1a<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git rebase -i\u3092\u4f7f\u3063\u3066\u9806\u756a\u3092\u5909\u66f4\u3059\u308b\u3002\u3053\u308c\u3067\u3001\u5909\u66f4\u3092\u304b\u3051\u305f\u3044\u30b3\u30df\u30c3\u30c8\u3092\u4e00\u756a\u5148\u982d\u306b\u6301\u3063\u3066\u304f\u308b\u3002<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git commit &#8211;amend\u30b3\u30de\u30f3\u30c9\u3067\u50c5\u304b\u306a\u5909\u66f4\u3092\u884c\u3046<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git rebase -i\u30b3\u30de\u30f3\u30c9\u3092\u518d\u5ea6\u4f7f\u3063\u3066\u3001\u5148\u982d\u306b\u6301\u3063\u3066\u304d\u3066\u3044\u305f\u30b3\u30df\u30c3\u30c8\u3092\u5143\u306b\u623b\u3059<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\u6700\u5f8c\u306b\u3001\u30ec\u30d9\u30eb\u30af\u30ea\u30a2\u306e\u305f\u3081\u306bmain\u30d6\u30e9\u30f3\u30c1\u3092\u5148\u982d\u306b\u6301\u3063\u3066\u304f\u308b<\/ul>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/73-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase -i HEAD~2\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/75-1.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git commit --amend\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/77-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase -i HEAD~2\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/79-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase caption main\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/81-0.png\" alt=\"image.png\" \/><\/div>\n<h3>\u534f\u8c03\u7ba1\u7406\u63d0\u4ea4\u4e8b\u9879<\/h3>\n<p>\u6839\u636e\u4e0a\u6b21\u7684\u89c1\u89e3\uff0c\u6211\u4eec\u4f7f\u7528\u4e86rebase -i\u547d\u4ee4\u6765\u6539\u53d8\u63d0\u4ea4\u987a\u5e8f\u3002\u5982\u679c\u5728\u6811\u7684\u9876\u90e8\u6709\u8981\u6539\u53d8\u7684\u63d0\u4ea4\uff0c\u5219\u53ef\u4ee5\u901a\u8fc7\u4f7f\u7528&#8211;amend\u9009\u9879\u8f7b\u677e\u5730\u4fee\u6539\u5e76\u6062\u590d\u5230\u539f\u6765\u7684\u987a\u5e8f\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/84-1.png\" alt=\"image.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/85-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git checkout main\r\n<\/code><\/pre>\n<pre class=\"post-pre\"><code>git cherry-pick C2\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/88-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git commit --amend\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/90-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git cherry-pick C3\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/92-0.png\" alt=\"image.png\" \/><\/div>\n<h2>Git\u7684\u6807\u7b7e<\/h2>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/94-1.png\" alt=\"image.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/95-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git tag v1 side~1\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/97-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git tag v0 main~2\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/99-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git checkout v1\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/101-0.png\" alt=\"image.png\" \/><\/div>\n<h3>Git Describe\u7684\u4e2d\u6587\u7ffb\u8bd1 \uff1a<\/h3>\n<p>Git\u63cf\u8ff0<\/p>\n<p>\u6807\u7b7e\u5728\u6e90\u5217\u8868\u4e2d\u5145\u5f53\u51fa\u8272\u7684&#8221;\u951a\uff08\u6807\u8bb0\uff09&#8221;\uff0c\u56e0\u6b64Git\u6709\u4e00\u4e2a\u547d\u4ee4\u6765\u63cf\u8ff0\u6700\u76f8\u5173\u7684&#8221;\u951a&#8221;\uff08\u53e6\u4e00\u79cd\u6807\u7b7e\u540d\u79f0\uff09\u3002\u800c\u8fd9\u4e2a\u547d\u4ee4\u88ab\u79f0\u4e3agit describe\uff01<\/p>\n<p>Git\u7684\u201c\u63cf\u8ff0\u201d\u529f\u80fd\u53ef\u4ee5\u5e2e\u52a9\u4f60\u77e5\u9053\u81ea\u5df1\u5728\u5927\u91cf\u63d0\u4ea4\u4e2d\u7684\u4f4d\u7f6e\uff0c\u5c24\u5176\u5728\u4f60\u9700\u8981\u79fb\u52a8\u65f6\uff08\u6bd4\u5982\u4f60\u8fd0\u884c\u5b8c\u4e00\u4e2a\u8c03\u8bd5\u641c\u7d22\u547d\u4ee4\u5982git bisect\uff0c\u6216\u8005\u4f60\u7684\u540c\u4e8b\u4ece\u4f11\u5047\u56de\u6765\u5750\u5728\u4ed6\u7684\u5ea7\u4f4d\u4e0a\u65f6\uff09\u3002<\/p>\n<p>Git\u7684\u63cf\u8ff0\u91c7\u7528\u4ee5\u4e0b\u683c\u5f0f\uff1a<\/p>\n<pre class=\"post-pre\"><code>git describe &lt;\u53c2\u7167&gt;\r\n<\/code><\/pre>\n<p>\u5728&lt;\u53c2\u7167&gt;\u4e2d\uff0c\u5305\u542b\u4e86Git\u53ef\u4ee5\u89e3\u91ca\u7684\u63d0\u4ea4\u7684\u5f15\u7528\u8868\u8fbe\uff08\u4f8b\u5982\u5206\u652f\u3001\u6807\u7b7e\u7684\u6307\u5b9a\uff0c\u63d0\u4ea4\u54c8\u5e0c\u7b49\uff09\u3002\u5982\u679c\u6ca1\u6709\u8f93\u5165\u4efb\u4f55\u5185\u5bb9\uff0cGit\u5c06\u4f7f\u7528\u5f53\u524d\u4f4d\u7f6e\u7684\u63d0\u4ea4\uff08HEAD\uff09\u3002<\/p>\n<p>\u547d\u4ee4\u7684\u7ed3\u679c\u5982\u4e0b\u6240\u793a\uff1a<\/p>\n<pre class=\"post-pre\"><code>&lt;\u30bf\u30b0&gt;_&lt;\u30b3\u30df\u30c3\u30c8\u6570&gt;_g&lt;\u30cf\u30c3\u30b7\u30e5&gt;\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/110-0.png\" alt=\"image.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/111-0.png\" alt=\"image.png\" \/><\/div>\n<p>\u7ec3\u4e60<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/113-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git commit\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/115-0.png\" alt=\"image.png\" \/><\/div>\n<h2>\u91cd\u5851\u591a\u4e2a\u5206\u652f<\/h2>\n<p>\u51fa\u73b0\u4e86\u8bb8\u591a\u5206\u652f\u3002\u8ba9\u6211\u4eec\u5c06\u6240\u6709\u8fd9\u4e9b\u5206\u652f\u90fd\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/118-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase main bugFix\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/120-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase bugFix side\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/122-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase side another\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/124-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git rebase another main\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/126-0.png\" alt=\"image.png\" \/><\/div>\n<h3>\u7236\u6bcd\u7684\u8981\u6c42<\/h3>\n<p>\u4e0e\u4fee\u9970\u5b50\u7c7b\u4f3c\uff0c\u4fee\u9970\u7b26\u4e5f\u53ef\u4ee5\u5728\u540e\u9762\u653e\u7f6e\u4efb\u610f\u7684\u7f16\u53f7\u3002<\/p>\n<p>\u60a8\u53ef\u4ee5\u6307\u5b9a\u4ece\u5408\u5e76\u63d0\u4ea4\u4e2d\u9009\u62e9\u54ea\u4e2a\u7236\u9879\uff0c\u800c\u4e0d\u662f\u6307\u5b9a\u8981\u56de\u6eaf\u7684\u7279\u5b9a\u6570\u91cf\uff08\u8fd9\u662f\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\u7684\u529f\u80fd\uff09\u3002\u8bf7\u8bb0\u4f4f\uff0c\u7531\u4e8e\u5408\u5e76\u63d0\u4ea4\u7531\u591a\u4e2a\u7236\u9879\u7ec4\u6210\uff0c\u6240\u4ee5\u9009\u62e9\u7684\u8def\u5f84\u53ef\u80fd\u662f\u4e0d\u660e\u786e\u7684\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/130-1.png\" alt=\"image.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/131-1.png\" alt=\"image.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/132-1.png\" alt=\"image.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/133-1.png\" alt=\"image.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/134-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git branch bugWork main^^2^\r\n<\/code><\/pre>\n<p>git\u5206\u652f\uff1a\u8fd9\u662f\u4e00\u4e2a\u7528\u4e8e\u521b\u5efa\u3001\u5c55\u793a\u548c\u5207\u6362\u5206\u652f\u7b49\u64cd\u4f5c\u7684\u547d\u4ee4\u3002<\/p>\n<p>bugWork\uff1a\u8fd9\u662f\u4e00\u4e2a\u5c06\u8981\u521b\u5efa\u7684\u5206\u652f\u7684\u540d\u79f0\u3002\u610f\u5473\u7740\u5c06\u4f1a\u521b\u5efa\u4e00\u4e2a\u540d\u4e3abugWork\u7684\u5206\u652f\u3002<\/p>\n<p>\u4e3b\u8981^^2^\uff1a\u8fd9\u662f\u5173\u4e8e\u63d0\u4ea4\u6307\u5b9a\u65b9\u6cd5\u7684\u8bf4\u660e\u3002\u5728\u8fd9\u91cc\uff0c\u6211\u4eec\u8868\u793a\u76f8\u5bf9\u4e8e&#8221;main&#8221;\u5206\u652f\u7684\u6307\u5b9a\u63d0\u4ea4\u7684\u4f4d\u7f6e\u3002<\/p>\n<p>\u7528\u4e2d\u6587\u7ffb\u8bd1\u4e3a\uff1a\u4e3b\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u79f0\u4e3a &#8220;main^&#8221;\u3002\u4e5f\u5c31\u662f\u8bf4\uff0c\u5b83\u6307\u7684\u662f\u524d\u4e00\u4e2a\u63d0\u4ea4\u3002<br \/>\n&#8220;main^2&#8221; \u6307\u7684\u662f\u4e3b\u5206\u652f\u524d\u4e00\u4e2a\u63d0\u4ea4\u7684\u7236\u63d0\u4ea4\u3002\u4e5f\u5c31\u662f\u8bf4\uff0c\u5b83\u6307\u7684\u662f\u524d\u4e24\u4e2a\u63d0\u4ea4\u3002<br \/>\n\u6362\u53e5\u8bdd\u8bf4\uff0c\u5b83\u6307\u5b9a\u4e86\u4e3b\u5206\u652f\u524d\u4e24\u4e2a\u63d0\u4ea4\u7684\u7236\u63d0\u4ea4\u3002<\/p>\n<p>\u56e0\u6b64\uff0cgit branch bugWork main^^2^ \u547d\u4ee4\u5c06\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c\uff1a<\/p>\n<p>\u6839\u636e\u4e3b\u5206\u652f\u7684\u524d\u4e24\u4e2a\u63d0\u4ea4 (main^^2^)\uff0c\u521b\u5efa\u4e00\u4e2a\u65b0\u7684 bugWork \u5206\u652f\u3002\u65b0\u5206\u652f\u5c06\u5305\u542b\u524d\u4e24\u4e2a\u63d0\u4ea4\u7684\u66f4\u6539\u5185\u5bb9\u3002\u8fd9\u6837\uff0c\u65b0\u7684 bugWork \u5206\u652f\u5c06\u88ab\u521b\u5efa\uff0c\u5e76\u5728\u8be5\u5206\u652f\u4e0a\u4ee5\u590d\u5236\u4e3b\u5206\u652f\u524d\u4e24\u4e2a\u63d0\u4ea4\u7684\u5185\u5bb9\u7684\u72b6\u6001\u5f00\u59cb\u3002\u901a\u5e38\u60c5\u51b5\u4e0b\uff0c\u8fd9\u79cd\u64cd\u4f5c\u7528\u4e8e\u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u9519\u8bef\u4fee\u590d\u7b49\u5de5\u4f5c\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/142-0.png\" alt=\"image.png\" \/><\/div>\n<h3>\u5206\u652f\u610f\u5927\u5229\u9762<\/h3>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/144-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git checkout one\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/146-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git cherry-pick C4 C3 C2\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/148-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git checkout two\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/150-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git cherry-pick C5 C4 C3 C2\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/152-0.png\" alt=\"image.png\" \/><\/div>\n<pre class=\"post-pre\"><code>git branch -f three C2\r\n<\/code><\/pre>\n<p>git branch\uff1a\u8fd9\u662f\u4e00\u4e2a\u7528\u4e8e\u521b\u5efa\u3001\u663e\u793a\u548c\u5207\u6362\u5206\u652f\u7b49\u64cd\u4f5c\u7684\u547d\u4ee4\u3002<\/p>\n<p>-f: \u6b64\u9009\u9879\u662f\u201cforce\u201d\u7684\u7f29\u5199\uff0c\u4f7f\u7528\u8be5\u9009\u9879\u53ef\u4ee5\u5c06\u5206\u652f\u5f3a\u5236\u79fb\u52a8\u5230\u6307\u5b9a\u7684\u63d0\u4ea4\u3002\u901a\u5e38\uff0c\u5728\u79fb\u52a8\u5206\u652f\u65f6\u9700\u8981\u6ce8\u610f\u4e0d\u8981\u7834\u574f\u63d0\u4ea4\u5386\u53f2\uff0c\u4f46\u4f7f\u7528\u6b64\u9009\u9879\u53ef\u4ee5\u5f3a\u5236\u79fb\u52a8\u5206\u652f\u3002<\/p>\n<p>\u4e09: \u8fd9\u662f\u60f3\u8981\u79fb\u52a8\u7684\u5206\u652f\u540d\u79f0\u3002\u5728\u8fd9\u91cc\uff0c\u6211\u4eec\u6307\u5b9a\u4e86\u4e09\u5206\u652f\u3002<\/p>\n<p>C2\uff1a\u8fd9\u91cc\u662f\u76ee\u6807\u63d0\u4ea4\u7684\u54c8\u5e0c\u503c\u6216\u63d0\u4ea4\u540d\u79f0\u3002\u6211\u4eec\u5728\u8fd9\u91cc\u6307\u5b9a\u4e86\u4e00\u4e2a\u540d\u4e3aC2\u7684\u63d0\u4ea4\u3002<\/p>\n<p>\u6362\u53e5\u8bdd\u8bf4\uff0cgit branch -f three C2\u547d\u4ee4\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c\uff1a<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/159-0.png\" alt=\"image.png\" \/><\/div>\n","protected":false},"excerpt":{"rendered":"<p>\u4f7f\u7528git merge\u547d\u4ee4\u5c06bugFix\u5206\u652f\u5408\u5e76\u5230main\u5206\u652f\u7684\u6d41\u7a0b\u3002 \u7528\u201cbugFix\u201d\u4f5c\u4e3a\u540d\u79f0\u521b\u5efa\u4e00\u4e2a\u65b0\u7684 [&hellip;]<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37252","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5408\u5e76-git-\u5206\u652f\u7684\u65b9\u6cd5-head-\u5b66\u4e60-git-\u5206\u652f\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f\" \/>\n<meta property=\"og:description\" content=\"\u4f7f\u7528git merge\u547d\u4ee4\u5c06bugFix\u5206\u652f\u5408\u5e76\u5230main\u5206\u652f\u7684\u6d41\u7a0b\u3002 \u7528\u201cbugFix\u201d\u4f5c\u4e3a\u540d\u79f0\u521b\u5efa\u4e00\u4e2a\u65b0\u7684 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5408\u5e76-git-\u5206\u652f\u7684\u65b9\u6cd5-head-\u5b66\u4e60-git-\u5206\u652f\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-07-16T12:38:06+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-28T20:15:17+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/13-0.png\" \/>\n<meta name=\"author\" content=\"\u97f5, \u79d1\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u97f5, \u79d1\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"2 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/\",\"name\":\"\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-07-16T12:38:06+00:00\",\"dateModified\":\"2024-04-28T20:15:17+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e\",\"name\":\"\u97f5, \u79d1\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g\",\"caption\":\"\u97f5, \u79d1\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunke\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/\u5408\u5e76-git-\u5206\u652f\u7684\u65b9\u6cd5-head-\u5b66\u4e60-git-\u5206\u652f\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f","og_description":"\u4f7f\u7528git merge\u547d\u4ee4\u5c06bugFix\u5206\u652f\u5408\u5e76\u5230main\u5206\u652f\u7684\u6d41\u7a0b\u3002 \u7528\u201cbugFix\u201d\u4f5c\u4e3a\u540d\u79f0\u521b\u5efa\u4e00\u4e2a\u65b0\u7684 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5408\u5e76-git-\u5206\u652f\u7684\u65b9\u6cd5-head-\u5b66\u4e60-git-\u5206\u652f\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-07-16T12:38:06+00:00","article_modified_time":"2024-04-28T20:15:17+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d7937434c4406c51637\/13-0.png"}],"author":"\u97f5, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u97f5, \u79d1","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"2 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/","name":"\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-07-16T12:38:06+00:00","dateModified":"2024-04-28T20:15:17+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5408\u5e76 Git \u5206\u652f\u7684\u65b9\u6cd5 | HEAD | \u5b66\u4e60 Git \u5206\u652f"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e","name":"\u97f5, \u79d1","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g","caption":"\u97f5, \u79d1"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunke\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%90%88%e5%b9%b6-git-%e5%88%86%e6%94%af%e7%9a%84%e6%96%b9%e6%b3%95-head-%e5%ad%a6%e4%b9%a0-git-%e5%88%86%e6%94%af\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37252","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37252"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37252\/revisions"}],"predecessor-version":[{"id":81077,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37252\/revisions\/81077"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37252"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37252"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37252"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}