{"id":16061,"date":"2024-07-22T12:55:38","date_gmt":"2024-07-22T04:55:38","guid":{"rendered":"https:\/\/92it.top\/?p=16061"},"modified":"2024-07-22T12:55:38","modified_gmt":"2024-07-22T04:55:38","slug":"git-%e4%b8%8d%e8%a6%81%e5%8f%aa%e4%bc%9a-pull-%e5%92%8c-push%ef%bc%8c%e8%af%95%e8%af%95%e8%bf%99-5-%e6%9d%a1%e6%8f%90%e9%ab%98%e6%95%88%e7%8e%87%e7%9a%84%e5%91%bd%e4%bb%a4%ef%bc%81","status":"publish","type":"post","link":"https:\/\/92it.top\/?p=16061","title":{"rendered":"Git \u4e0d\u8981\u53ea\u4f1a pull \u548c push\uff0c\u8bd5\u8bd5\u8fd9 5 \u6761\u63d0\u9ad8\u6548\u7387\u7684\u547d\u4ee4\uff01"},"content":{"rendered":"\n

\u8f6c\u8f7d\uff1aGit \u4e0d\u8981\u53ea\u4f1a pull \u548c push\uff0c\u8bd5\u8bd5\u8fd9 5 \u6761\u63d0\u9ad8\u6548\u7387\u7684\u547d\u4ee4\uff01<\/a><\/p>\n\n\n\n

\u524d\u8a00<\/strong><\/p>\n\n\n\n

\n\n\n\n

\u4f7f\u7528 Git \u4f5c\u4e3a\u4ee3\u7801\u7248\u672c\u7ba1\u7406\uff0c\u65e9\u5df2\u662f\u73b0\u5728\u5f00\u53d1\u5de5\u7a0b\u5e08\u5fc5\u5907\u7684\u6280\u80fd\u3002\u53ef\u5927\u591a\u6570\u5de5\u7a0b\u5e08\u8fd8\u662f\u53ea\u4f1a\u6700\u57fa\u672c\u7684\u4fdd\u5b58\u3001\u62c9\u53d6\u3001\u63a8\u9001\uff0c\u9047\u5230\u4e00\u4e9bcommit\u7ba1\u7406\u7684\u95ee\u9898\u5c31\u675f\u624b\u65e0\u7b56\uff0c\u6216\u8005\u7528\u4e00\u4e9b\u4e0d\u4f18\u96c5\u7684\u65b9\u5f0f\u89e3\u51b3\u3002<\/p>\n\n\n\n

\u672c\u6587\u5206\u4eab\u6211\u5728\u5f00\u53d1\u5de5\u4f5c\u4e2d\u5b9e\u8df5\u8fc7\u7684\u5b9e\u7528\u547d\u4ee4\u3002\u8fd9\u4e9b\u90fd\u80fd\u591f\u5927\u5927\u63d0\u9ad8\u5de5\u4f5c\u6548\u7387\uff0c\u8fd8\u80fd\u89e3\u51b3\u4e0d\u5c11\u7591\u96be\u573a\u666f\u3002\u4e0b\u9762\u4f1a\u4ecb\u7ecd\u547d\u4ee4\uff0c\u5217\u51fa\u5e94\u7528\u573a\u666f\uff0c\u624b\u6478\u624b\u6559\u5b66\u4f7f\u7528\uff0c\u8ba9\u540c\u5b66\u4eec\u770b\u5b8c\u5373\u5b66\u4f1a\u3002<\/p>\n\n\n

\n
\"\"<\/figure><\/div>\n\n\n

stash<\/strong><\/p>\n\n\n\n

\n\n\n\n

\u63cf\u8ff0<\/strong><\/p>\n\n\n\n

\u5b98\u65b9\u89e3\u91ca\uff1a\u5f53\u60a8\u60f3\u8bb0\u5f55\u5de5\u4f5c\u76ee\u5f55\u548c\u7d22\u5f15\u7684\u5f53\u524d\u72b6\u6001\uff0c\u4f46\u53c8\u60f3\u8fd4\u56de\u4e00\u4e2a\u5e72\u51c0\u7684\u5de5\u4f5c\u76ee\u5f55\u65f6\uff0c\u8bf7\u4f7f\u7528git stash\u3002\u8be5\u547d\u4ee4\u5c06\u4fdd\u5b58\u672c\u5730\u4fee\u6539\uff0c\u5e76\u6062\u590d\u5de5\u4f5c\u76ee\u5f55\u4ee5\u5339\u914d\u5934\u90e8\u63d0\u4ea4\u3002<\/p>\n\n\n\n

stash \u547d\u4ee4\u80fd\u591f\u5c06\u8fd8\u672a commit \u7684\u4ee3\u7801\u5b58\u8d77\u6765\uff0c\u8ba9\u4f60\u7684\u5de5\u4f5c\u76ee\u5f55\u53d8\u5f97\u5e72\u51c0\u3002<\/p>\n\n\n\n

\u5e94\u7528\u573a\u666f<\/strong><\/p>\n\n\n\n

\u6211\u731c\u4f60\u5fc3\u91cc\u4e00\u5b9a\u5728\u60f3\uff1a\u4e3a\u4ec0\u4e48\u8981\u53d8\u5e72\u51c0\uff1f<\/p>\n\n\n\n

\u5e94\u7528\u573a\u666f\uff1a\u67d0\u4e00\u5929\u4f60\u6b63\u5728 feature \u5206\u652f\u5f00\u53d1\u65b0\u9700\u6c42\uff0c\u7a81\u7136\u4ea7\u54c1\u7ecf\u7406\u8dd1\u8fc7\u6765\u8bf4\u7ebf\u4e0a\u6709bug\uff0c\u5fc5\u987b\u9a6c\u4e0a\u4fee\u590d\u3002\u800c\u6b64\u65f6\u4f60\u7684\u529f\u80fd\u5f00\u53d1\u5230\u4e00\u534a\uff0c\u4e8e\u662f\u4f60\u6025\u5fd9\u60f3\u5207\u5230 master \u5206\u652f\uff0c\u7136\u540e\u4f60\u5c31\u4f1a\u770b\u5230\u4ee5\u4e0b\u62a5\u9519\uff1a<\/p>\n\n\n

\n
\"\"<\/figure><\/div>\n\n\n

\u56e0\u4e3a\u5f53\u524d\u6709\u6587\u4ef6\u66f4\u6539\u4e86\uff0c\u9700\u8981\u63d0\u4ea4commit\u4fdd\u6301\u5de5\u4f5c\u533a\u5e72\u51c0\u624d\u80fd\u5207\u5206\u652f\u3002\u7531\u4e8e\u60c5\u51b5\u7d27\u6025\uff0c\u4f60\u53ea\u6709\u6025\u5fd9 commit \u4e0a\u53bb\uff0ccommit \u4fe1\u606f\u4e5f\u968f\u4fbf\u5199\u4e86\u4e2a\u201c\u6682\u5b58\u4ee3\u7801\u201d\uff0c\u4e8e\u662f\u8be5\u5206\u652f\u63d0\u4ea4\u8bb0\u5f55\u5c31\u7559\u4e86\u4e00\u6761\u9ed1\u5386\u53f2…(\u771f\u4eba\u771f\u4e8b\uff0c\u770b\u8fc7\u8fd9\u79cd\u63d0\u4ea4)<\/p>\n\n\n\n

\u547d\u4ee4\u4f7f\u7528<\/strong><\/p>\n\n\n\n

\u5982\u679c\u4f60\u5b66\u4f1a stash\uff0c\u5c31\u4e0d\u7528\u90a3\u4e48\u72fc\u72c8\u4e86\u3002\u4f60\u53ea\u9700\u8981\uff1a<\/p>\n\n\n\n

git stash<\/pre>\n\n\n\n
\u5c31\u8fd9\u4e48\u7b80\u5355\uff0c\u4ee3\u7801\u5c31\u88ab\u5b58\u8d77\u6765\u4e86\u3002<\/p>\n\n\n\n
\u5f53\u4f60\u4fee\u590d\u5b8c\u7ebf\u4e0a\u95ee\u9898\uff0c\u5207\u56de feature \u5206\u652f\uff0c\u60f3\u6062\u590d\u4ee3\u7801\u4e5f\u53ea\u9700\u8981\uff1a<\/p>\n\n\n\n
git stash apply<\/pre>\n\n\n\n
\u76f8\u5173\u547d\u4ee4<\/strong><\/p>\n\n\n\n
# \u4fdd\u5b58\u5f53\u524d\u672acommit\u7684\u4ee3\u7801\ngit stash\n\n# \u4fdd\u5b58\u5f53\u524d\u672acommit\u7684\u4ee3\u7801\u5e76\u6dfb\u52a0\u5907\u6ce8\ngit stash save \"\u5907\u6ce8\u7684\u5185\u5bb9\"\n\n# \u5217\u51fastash\u7684\u6240\u6709\u8bb0\u5f55\ngit stash list\n\n# \u5220\u9664stash\u7684\u6240\u6709\u8bb0\u5f55\ngit stash clear\n\n# \u5e94\u7528\u6700\u8fd1\u4e00\u6b21\u7684stash\ngit stash apply\n\n# \u5e94\u7528\u6700\u8fd1\u4e00\u6b21\u7684stash\uff0c\u968f\u540e\u5220\u9664\u8be5\u8bb0\u5f55\ngit stash pop\n\n# \u5220\u9664\u6700\u8fd1\u7684\u4e00\u6b21stash\ngit stash drop<\/pre>\n\n\n\n
\u5f53\u6709\u591a\u6761 stash\uff0c\u53ef\u4ee5\u6307\u5b9a\u64cd\u4f5cstash\uff0c\u9996\u5148\u4f7f\u7528stash list \u5217\u51fa\u6240\u6709\u8bb0\u5f55\uff1a<\/p>\n\n\n\n
$ git stash list\nstash@{0}: WIP on ...\nstash@{1}: WIP on ...\nstash@{2}: On ...<\/pre>\n\n\n\n
\u5e94\u7528\u7b2c\u4e8c\u6761\u8bb0\u5f55\uff1a<\/p>\n\n\n\n
git stash apply stash@{1}<\/pre>\n\n\n\n
pop\uff0cdrop \u540c\u7406\u3002<\/p>\n\n\n\n
reset –soft<\/strong><\/p>\n\n\n\n
\n\n\n\n
\u5b8c\u5168\u4e0d\u63a5\u89e6\u7d22\u5f15\u6587\u4ef6\u6216\u5de5\u4f5c\u6811\uff08\u4f46\u4f1a\u50cf\u6240\u6709\u6a21\u5f0f\u4e00\u6837\uff0c\u5c06\u5934\u90e8\u91cd\u7f6e\u4e3a\uff09\u3002\u8fd9\u4f7f\u60a8\u7684\u6240\u6709\u66f4\u6539\u7684\u6587\u4ef6\u66f4\u6539\u4e3a\u201c\u8981\u63d0\u4ea4\u7684\u66f4\u6539\u201d\u3002<\/p>\n\n\n\n
\u56de\u9000\u4f60\u5df2\u63d0\u4ea4\u7684 commit\uff0c\u5e76\u5c06 commit \u7684\u4fee\u6539\u5185\u5bb9\u653e\u56de\u5230\u6682\u5b58\u533a\u3002<\/p>\n\n\n\n
\u4e00\u822c\u6211\u4eec\u5728\u4f7f\u7528 reset \u547d\u4ee4\u65f6\uff0cgit reset --hard<\/code> \u4f1a\u88ab\u63d0\u53ca\u7684\u6bd4\u8f83\u591a\uff0c\u5b83\u80fd\u8ba9 commit \u8bb0\u5f55\u5f3a\u5236\u56de\u6eaf\u5230\u67d0\u4e00\u4e2a\u8282\u70b9\u3002\u800c git reset --soft<\/code> \u7684\u4f5c\u7528\u6b63\u5982\u5176\u540d\uff0c--soft<\/code> (\u67d4\u8f6f\u7684) \u9664\u4e86\u56de\u6eaf\u8282\u70b9\u5916\uff0c\u8fd8\u4f1a\u4fdd\u7559\u8282\u70b9\u7684\u4fee\u6539\u5185\u5bb9\u3002<\/p>\n\n\n\n
\u5e94\u7528\u573a\u666f<\/strong><\/p>\n\n\n\n
\n\n\n\n
\u56de\u6eaf\u8282\u70b9\uff0c\u4e3a\u4ec0\u4e48\u8981\u4fdd\u7559\u4fee\u6539\u5185\u5bb9\uff1f<\/p>\n\n\n\n
\u5e94\u7528\u573a\u666f1\uff1a\u6709\u65f6\u5019\u624b\u6ed1\u4e0d\u5c0f\u5fc3\u628a\u4e0d\u8be5\u63d0\u4ea4\u7684\u5185\u5bb9 commit \u4e86\uff0c\u8fd9\u65f6\u60f3\u6539\u56de\u6765\uff0c\u53ea\u80fd\u518d commit \u4e00\u6b21\uff0c\u53c8\u591a\u4e00\u6761\u201c\u9ed1\u5386\u53f2\u201d\u3002<\/p>\n\n\n\n
\u5e94\u7528\u573a\u666f2\uff1a\u89c4\u8303\u4e9b\u7684\u56e2\u961f\uff0c\u4e00\u822c\u5bf9\u4e8e commit \u7684\u5185\u5bb9\u8981\u6c42\u804c\u8d23\u660e\u786e\uff0c\u9897\u7c92\u5ea6\u8981\u7ec6\uff0c\u4fbf\u4e8e\u540e\u7eed\u51fa\u73b0\u95ee\u9898\u6392\u67e5\u3002\u672c\u6765\u5c5e\u4e8e\u4e24\u5757\u4e0d\u540c\u529f\u80fd\u7684\u4fee\u6539\uff0c\u4e00\u8d77 commit \u4e0a\u53bb\uff0c\u8fd9\u79cd\u5c31\u5c5e\u4e8e\u4e0d\u89c4\u8303\u3002\u8fd9\u6b21\u6070\u597d\u53c8\u624b\u6ed1\u4e86\uff0c\u4e00\u6b21\u6027 commit \u4e0a\u53bb\u3002<\/p>\n\n\n\n
\u547d\u4ee4\u4f7f\u7528<\/strong><\/p>\n\n\n\n
\u5b66\u4f1a reset --soft<\/code> \u4e4b\u540e\uff0c\u4f60\u53ea\u9700\u8981\uff1a<\/p>\n\n\n\n
# \u6062\u590d\u6700\u8fd1\u4e00\u6b21 commit\ngit reset --soft HEAD^<\/pre>\n\n\n\n
reset --soft<\/code> \u76f8\u5f53\u4e8e\u540e\u6094\u836f\uff0c\u7ed9\u4f60\u91cd\u65b0\u6539\u8fc7\u7684\u673a\u4f1a\u3002\u5bf9\u4e8e\u4e0a\u9762\u7684\u573a\u666f\uff0c\u5c31\u53ef\u4ee5\u518d\u6b21\u4fee\u6539\u91cd\u65b0\u63d0\u4ea4\uff0c\u4fdd\u6301\u5e72\u51c0\u7684 commit \u8bb0\u5f55\u3002<\/p>\n\n\n\n
\u4ee5\u4e0a\u8bf4\u7684\u662f\u8fd8\u672a push \u7684commit\u3002\u5bf9\u4e8e\u5df2\u7ecf push \u7684 commit\uff0c\u4e5f\u53ef\u4ee5\u4f7f\u7528\u8be5\u547d\u4ee4\uff0c\u4e0d\u8fc7\u518d\u6b21 push \u65f6\uff0c\u7531\u4e8e\u8fdc\u7a0b\u5206\u652f\u548c\u672c\u5730\u5206\u652f\u6709\u5dee\u5f02\uff0c\u9700\u8981\u5f3a\u5236\u63a8\u9001 git push -f<\/code> \u6765\u8986\u76d6\u88ab reset \u7684 commit\u3002<\/p>\n\n\n\n
\u8fd8\u6709\u4e00\u70b9\u9700\u8981\u6ce8\u610f\uff0c\u5728 reset --soft<\/code> \u6307\u5b9a commit \u53f7\u65f6\uff0c\u4f1a\u5c06\u8be5 commit \u5230\u6700\u8fd1\u4e00\u6b21 commit \u7684\u6240\u6709\u4fee\u6539\u5185\u5bb9\u5168\u90e8\u6062\u590d\uff0c\u800c\u4e0d\u662f\u53ea\u9488\u5bf9\u8be5 commit\u3002<\/p>\n\n\n\n
\u4e3e\u4e2a\u6817\u5b50\uff1a<\/p>\n\n\n\n
commit \u8bb0\u5f55\u6709 c\u3001b\u3001a\u3002<\/p>\n\n\n
\n
\"\"<\/figure><\/div>\n\n\n
reset \u5230 a\u3002<\/p>\n\n\n
\n
\"\"<\/figure><\/div>\n\n\n
\u6b64\u65f6\u7684 HEAD \u5230\u4e86 a\uff0c\u800c b\u3001c \u7684\u4fee\u6539\u5185\u5bb9\u90fd\u56de\u5230\u4e86\u6682\u5b58\u533a\u3002<\/p>\n\n\n
\n
\"\"<\/figure><\/div>\n\n\n
cherry-pick<\/strong><\/p>\n\n\n\n
\n\n\n\n
\u63cf\u8ff0<\/strong><\/p>\n\n\n\n
\u7ed9\u5b9a\u4e00\u4e2a\u6216\u591a\u4e2a\u73b0\u6709\u63d0\u4ea4\uff0c\u5e94\u7528\u6bcf\u4e2a\u63d0\u4ea4\u5f15\u5165\u7684\u66f4\u6539\uff0c\u4e3a\u6bcf\u4e2a\u63d0\u4ea4\u8bb0\u5f55\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u3002\u8fd9\u9700\u8981\u60a8\u7684\u5de5\u4f5c\u6811\u6e05\u6d01\uff08\u6ca1\u6709\u4ece\u5934\u63d0\u4ea4\u7684\u4fee\u6539\uff09\u3002<\/p>\n\n\n\n
\u5c06\u5df2\u7ecf\u63d0\u4ea4\u7684 commit\uff0c\u590d\u5236\u51fa\u65b0\u7684 commit \u5e94\u7528\u5230\u5206\u652f\u91cc<\/p>\n\n\n\n
\u5e94\u7528\u573a\u666f<\/strong><\/p>\n\n\n\n
ommit \u90fd\u63d0\u4ea4\u4e86\uff0c\u4e3a\u4ec0\u4e48\u8fd8\u8981\u590d\u5236\u65b0\u7684\u51fa\u6765\uff1f<\/p>\n\n\n\n
\u5e94\u7528\u573a\u666f1\uff1a\u6709\u65f6\u5019\u7248\u672c\u7684\u4e00\u4e9b\u4f18\u5316\u9700\u6c42\u5f00\u53d1\u5230\u4e00\u534a\uff0c\u53ef\u80fd\u5176\u4e2d\u67d0\u4e00\u4e2a\u5f00\u53d1\u5b8c\u7684\u9700\u6c42\u8981\u4e34\u65f6\u4e0a\uff0c\u6216\u8005\u67d0\u4e9b\u539f\u56e0\u5bfc\u81f4\u5f85\u5f00\u53d1\u7684\u9700\u6c42\u5361\u4f4f\u4e86\u5df2\u5f00\u53d1\u5b8c\u6210\u7684\u9700\u6c42\u4e0a\u7ebf\u3002\u8fd9\u65f6\u5019\u5c31\u9700\u8981\u628a commit \u62bd\u51fa\u6765\uff0c\u5355\u72ec\u5904\u7406\u3002<\/p>\n\n\n\n
\u5e94\u7528\u573a\u666f2\uff1a\u6709\u65f6\u5019\u5f00\u53d1\u5206\u652f\u4e2d\u7684\u4ee3\u7801\u8bb0\u5f55\u88ab\u6c61\u67d3\u4e86\uff0c\u5bfc\u81f4\u5f00\u53d1\u5206\u652f\u5408\u5230\u7ebf\u4e0a\u5206\u652f\u6709\u95ee\u9898\uff0c\u8fd9\u65f6\u5c31\u9700\u8981\u62c9\u4e00\u6761\u5e72\u51c0\u7684\u5f00\u53d1\u5206\u652f\uff0c\u518d\u4ece\u65e7\u7684\u5f00\u53d1\u5206\u652f\u4e2d\uff0c\u628a commit \u590d\u5236\u5230\u65b0\u5206\u652f\u3002<\/p>\n\n\n\n
\u590d\u5236\u5355\u4e2a<\/strong><\/p>\n\n\n\n
\u73b0\u5728\u6709\u4e00\u6761feature\u5206\u652f\uff0ccommit \u8bb0\u5f55\u5982\u4e0b\uff1a<\/p>\n\n\n
\n
\"\"<\/figure><\/div>\n\n\n
\u9700\u8981\u628a b \u590d\u5236\u5230\u53e6\u4e00\u4e2a\u5206\u652f\uff0c\u9996\u5148\u628a commitHash \u590d\u5236\u4e0b\u6765\uff0c\u7136\u540e\u5207\u5230 master \u5206\u652f\u3002<\/p>\n\n\n
\n
\"\"<\/figure><\/div>\n\n\n
\u5f53\u524d master \u6700\u65b0\u7684\u8bb0\u5f55\u662f a\uff0c\u4f7f\u7528 cherry-pick<\/code> \u628a b \u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u3002<\/p>\n\n\n
\n
\"\"<\/figure><\/div>\n\n\n
\u5b8c\u6210\u540e\u770b\u4e0b\u6700\u65b0\u7684 log\uff0cb \u5df2\u7ecf\u5e94\u7528\u5230 master\uff0c\u4f5c\u4e3a\u6700\u65b0\u7684 commit \u4e86\u3002\u53ef\u4ee5\u770b\u5230 commitHash \u548c\u4e4b\u524d\u7684\u4e0d\u4e00\u6837\uff0c\u4f46\u662f\u63d0\u4ea4\u65f6\u95f4\u8fd8\u662f\u4fdd\u7559\u4e4b\u524d\u7684\u3002<\/p>\n\n\n\n
\u590d\u5236\u591a\u4e2a<\/strong><\/p>\n\n\n\n
\u4ee5\u4e0a\u662f\u5355\u4e2a commit \u7684\u590d\u5236\uff0c\u4e0b\u9762\u518d\u6765\u770b\u770b cherry-pick<\/code> \u591a\u4e2a commit \u8981\u5982\u4f55\u64cd\u4f5c\u3002<\/p>\n\n\n\n
    \n
  • \u4e00\u6b21\u8f6c\u79fb\u591a\u4e2a\u63d0\u4ea4\uff1a<\/li>\n<\/ul>\n\n\n\n
    git cherry-pick commit1 commit2<\/pre>\n\n\n\n
    \u4e0a\u9762\u7684\u547d\u4ee4\u5c06 commit1 \u548c commit2 \u4e24\u4e2a\u63d0\u4ea4\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u3002<\/p>\n\n\n\n
      \n
    • \u591a\u4e2a\u8fde\u7eed\u7684commit\uff0c\u4e5f\u53ef\u533a\u95f4\u590d\u5236\uff1a<\/li>\n<\/ul>\n\n\n\n
      git cherry-pick commit1^..commit2<\/pre>\n\n\n\n
      \u4e0a\u9762\u7684\u547d\u4ee4\u5c06 commit1 \u5230 commit2 \u8fd9\u4e2a\u533a\u95f4\u7684 commit \u90fd\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\uff08\u5305\u542bcommit1\u3001commit2\uff09\uff0ccommit1 \u662f\u6700\u65e9\u7684\u63d0\u4ea4\u3002<\/p>\n\n\n\n
      cherry-pick \u4ee3\u7801\u51b2\u7a81<\/strong><\/p>\n\n\n\n
      \n\n\n\n
      \u5728 cherry-pick<\/code> \u591a\u4e2acommit\u65f6\uff0c\u53ef\u80fd\u4f1a\u9047\u5230\u4ee3\u7801\u51b2\u7a81\uff0c\u8fd9\u65f6 cherry-pick<\/code> \u4f1a\u505c\u4e0b\u6765\uff0c\u8ba9\u7528\u6237\u51b3\u5b9a\u5982\u4f55\u7ee7\u7eed\u64cd\u4f5c\u3002\u4e0b\u9762\u770b\u770b\u600e\u4e48\u89e3\u51b3\u8fd9\u79cd\u573a\u666f\u3002<\/p>\n\n\n
      \n
      \"\"<\/figure><\/div>\n\n\n
      \u8fd8\u662f feature \u5206\u652f\uff0c\u73b0\u5728\u9700\u8981\u628a c\u3001d\u3001e \u90fd\u590d\u5236\u5230 master \u5206\u652f\u4e0a\u3002\u5148\u628a\u8d77\u70b9c\u548c\u7ec8\u70b9e\u7684 commitHash \u8bb0\u4e0b\u6765\u3002<\/p>\n\n\n
      \n
      \"\"<\/figure><\/div>\n\n\n
      \u5207\u5230 master \u5206\u652f\uff0c\u4f7f\u7528\u533a\u95f4\u7684 cherry-pick<\/code>\u3002\u53ef\u4ee5\u770b\u5230 c \u88ab\u6210\u529f\u590d\u5236\uff0c\u5f53\u8fdb\u884c\u5230 d \u65f6\uff0c\u53d1\u73b0\u4ee3\u7801\u51b2\u7a81\uff0ccherry-pick<\/code> \u4e2d\u65ad\u4e86\u3002\u8fd9\u65f6\u9700\u8981\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\uff0c\u91cd\u65b0\u63d0\u4ea4\u5230\u6682\u5b58\u533a\u3002<\/p>\n\n\n
      \n
      \"\"<\/figure><\/div>\n\n\n
      \u7136\u540e\u4f7f\u7528 cherry-pick --continue<\/code> \u8ba9 cherry-pick<\/code> \u7ee7\u7eed\u8fdb\u884c\u4e0b\u53bb\u3002\u6700\u540e e \u4e5f\u88ab\u590d\u5236\u8fdb\u6765\uff0c\u6574\u4e2a\u6d41\u7a0b\u5c31\u5b8c\u6210\u4e86\u3002<\/p>\n\n\n\n
      \u4ee5\u4e0a\u662f\u5b8c\u6574\u7684\u6d41\u7a0b\uff0c\u4f46\u6709\u65f6\u5019\u53ef\u80fd\u9700\u8981\u5728\u4ee3\u7801\u51b2\u7a81\u540e\uff0c\u653e\u5f03\u6216\u8005\u9000\u51fa\u6d41\u7a0b\uff1a<\/p>\n\n\n\n
        \n
      • \u653e\u5f03 cherry-pick<\/code>\uff1a<\/li>\n<\/ul>\n\n\n\n
        gits cherry-pick --abort<\/pre>\n\n\n\n
        \u56de\u5230\u64cd\u4f5c\u524d\u7684\u6837\u5b50\uff0c\u5c31\u50cf\u4ec0\u4e48\u90fd\u6ca1\u53d1\u751f\u8fc7\u3002<\/p>\n\n\n\n
          \n
        • \u9000\u51fa cherry-pick<\/code>\uff1a<\/li>\n<\/ul>\n\n\n\n
          git cherry-pick --quit<\/pre>\n\n\n\n
          \u4e0d\u56de\u5230\u64cd\u4f5c\u524d\u7684\u6837\u5b50\u3002\u5373\u4fdd\u7559\u5df2\u7ecf cherry-pick<\/code> \u6210\u529f\u7684 commit\uff0c\u5e76\u9000\u51fa cherry-pick<\/code> \u6d41\u7a0b\u3002<\/p>\n\n\n\n
          revert<\/strong><\/p>\n\n\n\n
          \n\n\n\n
          \u63cf\u8ff0<\/strong><\/p>\n\n\n\n
          \u7ed9\u5b9a\u4e00\u4e2a\u6216\u591a\u4e2a\u73b0\u6709\u63d0\u4ea4\uff0c\u6062\u590d\u76f8\u5173\u63d0\u4ea4\u5f15\u5165\u7684\u66f4\u6539\uff0c\u5e76\u8bb0\u5f55\u4e00\u4e9b\u8fd9\u4e9b\u66f4\u6539\u7684\u65b0\u63d0\u4ea4\u3002\u8fd9\u5c31\u8981\u6c42\u4f60\u7684\u5de5\u4f5c\u6811\u662f\u5e72\u51c0\u7684\uff08\u6ca1\u6709\u6765\u81ea\u5934\u90e8\u7684\u4fee\u6539\uff09\u3002<\/p>\n\n\n\n
          \u5c06\u73b0\u6709\u7684\u63d0\u4ea4\u8fd8\u539f\uff0c\u6062\u590d\u63d0\u4ea4\u7684\u5185\u5bb9\uff0c\u5e76\u751f\u6210\u4e00\u6761\u8fd8\u539f\u8bb0\u5f55\u3002<\/p>\n\n\n\n
          \u5e94\u7528\u573a\u666f<\/strong><\/p>\n\n\n\n
          \u5e94\u7528\u573a\u666f\uff1a\u6709\u4e00\u5929\u6d4b\u8bd5\u7a81\u7136\u8ddf\u4f60\u8bf4\uff0c\u4f60\u5f00\u53d1\u4e0a\u7ebf\u7684\u529f\u80fd\u6709\u95ee\u9898\uff0c\u9700\u8981\u9a6c\u4e0a\u64a4\u56de\uff0c\u5426\u5219\u4f1a\u5f71\u54cd\u5230\u7cfb\u7edf\u4f7f\u7528\u3002\u8fd9\u65f6\u53ef\u80fd\u4f1a\u60f3\u5230\u7528 reset \u56de\u9000\uff0c\u53ef\u662f\u4f60\u770b\u4e86\u770b\u5206\u652f\u4e0a\u6700\u65b0\u7684\u63d0\u4ea4\u8fd8\u6709\u5176\u4ed6\u540c\u4e8b\u7684\u4ee3\u7801\uff0c\u7528 reset \u4f1a\u628a\u8fd9\u90e8\u5206\u4ee3\u7801\u4e5f\u64a4\u56de\u4e86\u3002\u7531\u4e8e\u60c5\u51b5\u7d27\u6025\uff0c\u53c8\u60f3\u4e0d\u5230\u597d\u65b9\u6cd5\uff0c\u8fd8\u662f\u4efb\u6027\u7684\u4f7f\u7528 reset\uff0c\u7136\u540e\u518d\u8ba9\u540c\u4e8b\u628a\u4ed6\u7684\u4ee3\u7801\u5408\u4e00\u904d\uff08\u540c\u4e8b\u542c\u5230\u60f3\u6253\u4eba\uff09\uff0c\u4e8e\u662f\u4f60\u7684\u6280\u672f\u5f62\u8c61\u5728\u540c\u4e8b\u773c\u91cc\u4e00\u843d\u5343\u4e08\u3002<\/p>\n\n\n\n
          \u547d\u4ee4\u4f7f\u7528<\/strong><\/p>\n\n\n\n
          revert \u666e\u901a\u63d0\u4ea4<\/strong><\/p>\n\n\n\n
          \u5b66\u4f1a revert \u4e4b\u540e\uff0c\u7acb\u9a6c\u5c31\u53ef\u4ee5\u62ef\u6551\u8fd9\u79cd\u5c34\u5c2c\u7684\u60c5\u51b5\u3002<\/p>\n\n\n\n
          \u73b0\u5728 master \u8bb0\u5f55\u5982\u4e0b\uff1a<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          revert \u6389\u81ea\u5df1\u63d0\u4ea4\u7684 commit\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u56e0\u4e3a revert \u4f1a\u751f\u6210\u4e00\u6761\u65b0\u7684\u63d0\u4ea4\u8bb0\u5f55\uff0c\u8fd9\u65f6\u4f1a\u8ba9\u4f60\u7f16\u8f91\u63d0\u4ea4\u4fe1\u606f\uff0c\u7f16\u8f91\u5b8c\u540e :wq \u4fdd\u5b58\u9000\u51fa\u5c31\u597d\u4e86\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u518d\u6765\u770b\u4e0b\u6700\u65b0\u7684 log\uff0c\u751f\u6210\u4e86\u4e00\u6761 revert \u8bb0\u5f55\uff0c\u867d\u7136\u81ea\u5df1\u4e4b\u524d\u7684\u63d0\u4ea4\u8bb0\u5f55\u8fd8\u662f\u4f1a\u4fdd\u7559\u7740\uff0c\u4f46\u4f60\u4fee\u6539\u7684\u4ee3\u7801\u5185\u5bb9\u5df2\u7ecf\u88ab\u64a4\u56de\u4e86\u3002<\/p>\n\n\n\n
          revert \u5408\u5e76\u63d0\u4ea4<\/strong><\/p>\n\n\n\n
          \u5728 git \u7684 commit \u8bb0\u5f55\u91cc\uff0c\u8fd8\u6709\u4e00\u79cd\u7c7b\u578b\u662f\u5408\u5e76\u63d0\u4ea4\uff0c\u60f3\u8981 revert \u5408\u5e76\u63d0\u4ea4\uff0c\u4f7f\u7528\u4e0a\u4f1a\u6709\u4e9b\u4e0d\u4e00\u6837\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u73b0\u5728\u7684 master \u5206\u652f\u91cc\u591a\u4e86\u6761\u5408\u5e76\u63d0\u4ea4\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u73b0\u5728\u7684 master \u5206\u652f\u91cc\u591a\u4e86\u6761\u5408\u5e76\u63d0\u4ea4\u3002<\/p>\n\n\n\n
          \u4f7f\u7528\u521a\u521a\u540c\u6837\u7684 revert \u65b9\u6cd5\uff0c\u4f1a\u53d1\u73b0\u547d\u4ee4\u884c\u62a5\u9519\u4e86\u3002<\/p>\n\n\n\n
          \u4e3a\u4ec0\u4e48\u4f1a\u8fd9\u6837\uff1f\u5728\u5b98\u65b9\u6587\u6863\u4e2d\u6709\u89e3\u91ca\u3002<\/p>\n\n\n\n
          \u901a\u5e38\u65e0\u6cd5 revert \u5408\u5e76\uff0c\u56e0\u4e3a\u60a8\u4e0d\u77e5\u9053\u5408\u5e76\u7684\u54ea\u4e00\u4fa7\u5e94\u88ab\u89c6\u4e3a\u4e3b\u7ebf\u3002\u6b64\u9009\u9879\u6307\u5b9a\u4e3b\u7ebf\u7684\u7236\u7f16\u53f7\uff08\u4ece1\u5f00\u59cb\uff09\uff0c\u5e76\u5141\u8bb8 revert \u53cd\u8f6c\u76f8\u5bf9\u4e8e\u6307\u5b9a\u7236\u7f16\u53f7\u7684\u66f4\u6539<\/p>\n\n\n\n
          \u6211\u7684\u7406\u89e3\u662f\u56e0\u4e3a\u5408\u5e76\u63d0\u4ea4\u662f\u4e24\u6761\u5206\u652f\u7684\u4ea4\u96c6\u8282\u70b9\uff0c\u800c git \u4e0d\u77e5\u9053\u9700\u8981\u64a4\u9500\u7684\u54ea\u4e00\u6761\u5206\u652f\uff0c\u9700\u8981\u6dfb\u52a0\u53c2\u6570 -m \u6307\u5b9a\u4e3b\u7ebf\u5206\u652f\uff0c\u4fdd\u7559\u4e3b\u7ebf\u5206\u652f\u7684\u4ee3\u7801\uff0c\u53e6\u4e00\u6761\u5219\u88ab\u64a4\u9500\u3002<\/p>\n\n\n\n
          -m \u540e\u9762\u8981\u8ddf\u4e00\u4e2a parent number \u6807\u8bc6\u51fa”\u4e3b\u7ebf”\uff0c\u4e00\u822c\u4f7f\u7528 1 \u4fdd\u7559\u4e3b\u5206\u652f\u4ee3\u7801\u3002<\/p>\n\n\n\n
          git revert -m 1 <commitHash><\/pre>\n\n\n\n
          revert \u5408\u5e76\u63d0\u4ea4\u540e\uff0c\u518d\u6b21\u5408\u5e76\u5206\u652f\u4f1a\u5931\u6548<\/strong><\/p>\n\n\n\n
          \u8fd8\u662f\u4e0a\u9762\u7684\u573a\u666f\uff0c\u5728 master \u5206\u652f revert \u5408\u5e76\u63d0\u4ea4\u540e\uff0c\u7136\u540e\u5207\u5230 feature \u5206\u652f\u4fee\u590d\u597d bug\uff0c\u518d\u5408\u5e76\u5230 master \u5206\u652f\u65f6\uff0c\u4f1a\u53d1\u73b0\u4e4b\u524d\u88ab revert \u7684\u4fee\u6539\u5185\u5bb9\u6ca1\u6709\u91cd\u65b0\u5408\u5e76\u8fdb\u6765\u3002<\/p>\n\n\n\n
          \u56e0\u4e3a\u4f7f\u7528 revert \u540e\uff0c feature \u5206\u652f\u7684 commit \u8fd8\u662f\u4f1a\u4fdd\u7559\u5728 master \u5206\u652f\u7684\u8bb0\u5f55\u4e2d\uff0c\u5f53\u4f60\u518d\u6b21\u5408\u5e76\u8fdb\u53bb\u65f6\uff0cgit \u5224\u65ad\u6709\u76f8\u540c\u7684 commitHash\uff0c\u5c31\u5ffd\u7565\u4e86\u76f8\u5173 commit \u4fee\u6539\u7684\u5185\u5bb9\u3002<\/p>\n\n\n\n
          \u8fd9\u65f6\u5c31\u9700\u8981 revert \u6389\u4e4b\u524d revert \u7684\u5408\u5e76\u63d0\u4ea4\uff0c\u6709\u70b9\u62d7\u53e3\uff0c\u63a5\u4e0b\u6765\u770b\u64cd\u4f5c\u5427\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u73b0\u5728 master \u7684\u8bb0\u5f55\u662f\u8fd9\u6837\u7684\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u518d\u6b21\u4f7f\u7528 revert\uff0c\u4e4b\u524d\u88ab revert \u7684\u4fee\u6539\u5185\u5bb9\u5c31\u53c8\u56de\u6765\u4e86\u3002<\/p>\n\n\n\n
          reflog<\/strong><\/p>\n\n\n\n
          \n\n\n\n
          \u63cf\u8ff0<\/strong><\/p>\n\n\n\n
          \u6b64\u547d\u4ee4\u7ba1\u7406\u91cd\u5f55\u4e2d\u8bb0\u5f55\u7684\u4fe1\u606f\u3002<\/p>\n\n\n\n
          \u5982\u679c\u8bf4 reset --soft<\/code> \u662f\u540e\u6094\u836f\uff0c\u90a3 reflog \u5c31\u662f\u5f3a\u529b\u540e\u6094\u836f\u3002\u5b83\u8bb0\u5f55\u4e86\u6240\u6709\u7684 commit \u64cd\u4f5c\u8bb0\u5f55\uff0c\u4fbf\u4e8e\u9519\u8bef\u64cd\u4f5c\u540e\u627e\u56de\u8bb0\u5f55\u3002<\/p>\n\n\n\n
          \u5e94\u7528\u573a\u666f<\/strong><\/p>\n\n\n\n
          \u5e94\u7528\u573a\u666f\uff1a\u67d0\u5929\u4f60\u773c\u82b1\uff0c\u53d1\u73b0\u81ea\u5df1\u5728\u5176\u4ed6\u4eba\u5206\u652f\u63d0\u4ea4\u4e86\u4ee3\u7801\u8fd8\u63a8\u5230\u8fdc\u7a0b\u5206\u652f\uff0c\u8fd9\u65f6\u56e0\u4e3a\u5206\u652f\u53ea\u6709\u4f60\u7684\u6700\u65b0\u63d0\u4ea4\uff0c\u5c31\u60f3\u7740\u4f7f\u7528 reset --hard<\/code>\uff0c\u7ed3\u679c\u7d27\u5f20\u4e0d\u5c0f\u5fc3\u8bb0\u9519\u4e86 commitHash\uff0creset \u8fc7\u5934\uff0c\u628a\u540c\u4e8b\u7684 commit \u641e\u6ca1\u4e86\u3002\u6ca1\u529e\u6cd5\uff0creset --hard<\/code> \u662f\u5f3a\u5236\u56de\u9000\u7684\uff0c\u627e\u4e0d\u5230 commitHash \u4e86\uff0c\u53ea\u80fd\u8ba9\u540c\u4e8b\u4ece\u672c\u5730\u5206\u652f\u518d\u63a8\u4e00\u6b21\uff08\u540c\u4e8b\u77ac\u95f4\u62f3\u5934\u5c31\u786c\u4e86\uff0c\u600e\u4e48\u53c8\u662f\u4f60\uff09\u3002\u4e8e\u662f\uff0c\u4f60\u7684\u6280\u672f\u5f62\u8c61\u53c8\u4e00\u843d\u5343\u4e08\u3002<\/p>\n\n\n\n
          \u547d\u4ee4\u4f7f\u7528<\/strong><\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u5206\u652f\u8bb0\u5f55\u5982\u4e0a\uff0c\u60f3\u8981 reset \u5230 b\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u8bef\u64cd\u4f5c reset \u8fc7\u5934\uff0cb \u6ca1\u4e86\uff0c\u6700\u65b0\u7684\u53ea\u5269\u4e0b a\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u8fd9\u65f6\u7528 git reflog<\/code> \u67e5\u770b\u5386\u53f2\u8bb0\u5f55\uff0c\u628a\u9519\u8bef\u63d0\u4ea4\u7684\u90a3\u6b21 commitHash \u8bb0\u4e0b\u3002<\/p>\n\n\n
          \n
          \"\"<\/figure><\/div>\n\n\n
          \u518d\u6b21 reset \u56de\u53bb\uff0c\u5c31\u4f1a\u53d1\u73b0 b \u56de\u6765\u4e86\u3002<\/p>\n\n\n\n
          \u8bbe\u7f6e Git \u77ed\u547d\u4ee4<\/strong><\/p>\n\n\n\n
          \n\n\n\n
          \u5bf9\u6211\u8fd9\u79cd\u559c\u6b22\u6572\u547d\u4ee4\u800c\u4e0d\u7528\u56fe\u5f62\u5316\u5de5\u5177\u7684\u7231\u597d\u8005\u6765\u8bf4\uff0c\u8bbe\u7f6e\u77ed\u547d\u4ee4\u53ef\u4ee5\u5f88\u597d\u7684\u63d0\u9ad8\u6548\u7387\u3002\u4e0b\u9762\u4ecb\u7ecd\u4e24\u79cd\u8bbe\u7f6e\u77ed\u547d\u4ee4\u7684\u65b9\u5f0f\u3002<\/p>\n\n\n\n
          \u65b9\u5f0f\u4e00<\/strong><\/p>\n\n\n\n
          git config --global alias.ps push<\/pre>\n\n\n\n
          \u65b9\u5f0f\u4e8c<\/strong><\/p>\n\n\n\n
          \u6253\u5f00\u5168\u5c40\u914d\u7f6e\u6587\u4ef6<\/p>\n\n\n\n
          vim ~\/.gitconfig<\/pre>\n\n\n\n
          \u5199\u5165\u5185\u5bb9<\/p>\n\n\n\n
          [alias] \n        co = checkout\n        ps = push\n        pl = pull\n        mer = merge --no-ff\n        cp = cherry-pick<\/pre>\n\n\n\n
          \u4f7f\u7528<\/strong><\/p>\n\n\n\n
          # \u7b49\u540c\u4e8e git cherry-pick <commitHash>\ngit cp <commitHash><\/pre>\n\n\n\n
          \u603b\u7ed3<\/strong><\/p>\n\n\n\n
          \n\n\n\n
          \u672c\u6587\u4e3b\u8981\u5206\u4eab\u4e865\u4e2a\u5728\u5f00\u53d1\u4e2d\u5b9e\u7528\u7684 Git \u547d\u4ee4\u548c\u8bbe\u7f6e\u77ed\u547d\u4ee4\u7684\u65b9\u5f0f\u3002<\/p>\n\n\n\n
            \n
          • stash<\/code>\uff1a\u5b58\u50a8\u4e34\u65f6\u4ee3\u7801\u3002<\/li>\n\n\n\n
          • reset --soft<\/code>\uff1a\u8f6f\u56de\u6eaf\uff0c\u56de\u9000 commit \u7684\u540c\u65f6\u4fdd\u7559\u4fee\u6539\u5185\u5bb9\u3002<\/li>\n\n\n\n
          • cherry-pick<\/code>\uff1a\u590d\u5236 commit\u3002<\/li>\n\n\n\n
          • revert<\/code>\uff1a\u64a4\u9500 commit \u7684\u4fee\u6539\u5185\u5bb9\u3002<\/li>\n\n\n\n
          • reflog<\/code>\uff1a\u8bb0\u5f55\u4e86 commit \u7684\u5386\u53f2\u64cd\u4f5c\u3002<\/li>\n<\/ul>\n\n\n\n
            \u6587\u4e2d\u5217\u4e3e\u7684\u5e94\u7528\u573a\u666f\u6709\u90e8\u5206\u4e0d\u592a\u6070\u5f53\uff0c\u53ea\u662f\u60f3\u4fbf\u4e8e\u540c\u5b66\u4eec\u7406\u89e3\uff0c\u6700\u91cd\u8981\u7684\u662f\u8981\u7406\u89e3\u547d\u4ee4\u7684\u4f5c\u7528\u662f\u4ec0\u4e48\uff0c\u6d3b\u5b66\u6d3b\u7528\u624d\u80fd\u53d1\u6325\u6700\u5927\u529f\u6548\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
            \u8f6c\u8f7d\uff1aGit \u4e0d\u8981\u53ea\u4f1a pull \u548c push\uff0c\u8bd5\u8bd5\u8fd9 5 \u6761\u63d0\u9ad8\u6548\u7387\u7684\u547d\u4ee4\uff01 \u524d\u8a00 \u4f7f\u7528 Git \u4f5c\u4e3a\u4ee3\u7801\u7248 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[10],"tags":[],"_links":{"self":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/16061"}],"collection":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=16061"}],"version-history":[{"count":2,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/16061\/revisions"}],"predecessor-version":[{"id":16101,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/16061\/revisions\/16101"}],"wp:attachment":[{"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=16061"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=16061"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=16061"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}