Git Rebase<\/h1>\n<\/p><\/div>\n

\n Rebasing\u662f\u4e00\u4e2a\u5728\u53e6\u4e00\u4e2a\u57fa\u7840\u884c\u7a0b\u4e4b\u4e0a\u91cd\u65b0\u5e94\u7528\u63d0\u4ea4\u7684\u8fc7\u7a0b\u3002\u5b83\u7528\u4e8e\u5c06\u6765\u81ea\u4e0d\u540c\u5206\u652f\u7684\u4e00\u7cfb\u5217\u63d0\u4ea4\u5e94\u7528\u4e8e\u6700\u7ec8\u63d0\u4ea4\u3002\u5b83\u662fgit merge\u547d\u4ee4\u7684\u66ff\u4ee3\u65b9\u6cd5\u3002\u8fd9\u662f\u4e00\u4e2a\u7ebf\u6027\u7684\u5408\u5e76\u8fc7\u7a0b\u3002\n <\/div>\n

\n \u5728Git\u4e2d\uff0c\u672f\u8bedrebase\u88ab\u79f0\u4e3a\u5c06\u4e00\u7cfb\u5217\u63d0\u4ea4\u6216\u79fb\u52a8\u5230\u65b0\u7684\u57fa\u672c\u63d0\u4ea4\u4e2d\u7684\u8fc7\u7a0b\u3002\u91cd\u5b9a\u57fa\u975e\u5e38\u6709\u76ca\uff0c\u5b83\u53ef\u4ee5\u5728\u529f\u80fd\u5206\u652f\u5de5\u4f5c\u6d41\u7684\u73af\u5883\u4e2d\u53ef\u89c6\u5316\u8be5\u8fc7\u7a0b\u3002\n <\/div>\n

\n \u5728\u5408\u5e76\u5206\u652f\u4e4b\u524d\u5148\u91cd\u5b9a\u57fa\uff0c\u8fd9\u662f\u5f88\u597d\u7684\u505a\u6cd5\u3002\n <\/div>\n

$Git Rebase_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c1\u5f20$ <\/p>\n

\n \u901a\u5e38\uff0c\u5b83\u662fgit merge\u547d\u4ee4\u7684\u66ff\u4ee3\u65b9\u6cd5\u3002\u5408\u5e76\u59cb\u7ec8\u662f\u5411\u524d\u66f4\u6539\u7684\u8bb0\u5f55\u3002\u76f8\u5bf9\u800c\u8a00\uff0crebase\u662fgit\u4e2d\u4ee4\u4eba\u4fe1\u670d\u7684\u5386\u53f2\u8bb0\u5f55\u91cd\u5199\u5de5\u5177\u3002\u5b83\u4e00\u4e00\u5408\u5e76\u4e0d\u540c\u7684\u63d0\u4ea4\u3002\n <\/div>\n

\n \u5047\u8bbe\u60a8\u5df2\u7ecf\u5728master\u5206\u652f\u4e2d\u8fdb\u884c\u4e863\u6b21\u63d0\u4ea4\uff0c\u5728\u540d\u4e3atest\u7684\u5176\u4ed6\u5206\u652f\u4e2d\u8fdb\u884c\u4e863\u6b21\u63d0\u4ea4\u3002\u5982\u679c\u5c06\u5176\u5408\u5e76\uff0c\u5219\u5b83\u5c06\u4e00\u6b21\u5408\u5e76\u6240\u6709\u63d0\u4ea4\u3002\u4f46\u662f\uff0c\u5982\u679c\u60a8\u91cd\u65b0\u8bbe\u7f6e\u57fa\u7840\uff0c\u5219\u5b83\u5c06\u4ee5\u7ebf\u6027\u65b9\u5f0f\u5408\u5e76\u3002\u8003\u8651\u4e0b\u9762\u7684\u56fe\u50cf:\n <\/div>\n

$Git Rebase_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c2\u5f20$ <\/p>\n

\n \u4e0a\u9762\u7684\u56fe\u50cf\u63cf\u8ff0\u4e86git rebase\u7684\u5de5\u4f5c\u65b9\u5f0f\u3002 master\u5206\u652f\u7684\u4e09\u4e2a\u63d0\u4ea4\u4e0etest\u5206\u652f\u7684\u63d0\u4ea4\u7ebf\u6027\u5408\u5e76\u3002\n <\/div>\n

\n \u5408\u5e76\u662f\u96c6\u6210\u5206\u652f\u7684\u6700\u76f4\u63a5\u65b9\u6cd5\u3002\u5b83\u5728\u4e24\u4e2a\u6700\u65b0\u7684\u5206\u652f\u63d0\u4ea4\u4e4b\u95f4\u6267\u884c\u4e09\u5411\u5408\u5e76\u3002\n <\/div>\n

\u5982\u4f55\u91cd\u65b0\u8bbe\u7f6e<\/h2>\n

\n \u5728\u529f\u80fd\u5206\u652f(\u6d4b\u8bd5\u5206\u652f)\u4e0a\u8fdb\u884c\u67d0\u4e9b\u63d0\u4ea4\u800c\u5728\u4e3b\u5206\u652f\u4e2d\u8fdb\u884c\u67d0\u4e9b\u63d0\u4ea4\u65f6\u3002\u60a8\u53ef\u4ee5\u5c06\u4efb\u4f55\u8fd9\u4e9b\u5206\u652f\u4f5c\u4e3a\u57fa\u51c6\u3002\u4f7f\u7528git log\u547d\u4ee4\u8ddf\u8e2a\u66f4\u6539(\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55)\u3002\u7b7e\u51fa\u5230\u8981\u91cd\u65b0\u8bbe\u7f6e\u57fa\u51c6\u7684\u6240\u9700\u5206\u652f\u3002\u73b0\u5728\uff0c\u6309\u5982\u4e0b\u6240\u793a\u6267\u884crebase\u547d\u4ee4:\n <\/div>\n

\n \u8bed\u6cd5:\n <\/div>\n

$git rebase <branch name><\/pre>\n<\/code>\n  <\/div>\n
\n    \u5982\u679c\u5206\u652f\u4e2d\u6709\u4e00\u4e9b\u51b2\u7a81\uff0c\u8bf7\u89e3\u51b3\u5b83\u4eec\uff0c\u7136\u540e\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u4ee5\u7ee7\u7eed\u66f4\u6539:\n  <\/div>\n\n$ git status<\/pre>\n<\/code>\n  <\/div>\n
\n    \u5b83\u7528\u4e8e\u68c0\u67e5\u72b6\u6001\uff0c\n  <\/div>\n\n$git rebase--continue<\/span><\/pre>\n<\/code>\n  <\/div>\n
\n    \u4ee5\u4e0a\u547d\u4ee4\u7528\u4e8e\u7ee7\u7eed\u6240\u505a\u7684\u66f4\u6539\u3002\u5982\u679c\u8981\u8df3\u8fc7\u66f4\u6539\uff0c\u53ef\u4ee5\u8df3\u8fc7\u4ee5\u4e0b\u64cd\u4f5c:\n  <\/div>\n\n$ git rebase--skip<\/pre>\n<\/code>\n  <\/div>\n
\n    \u91cd\u65b0\u5b9a\u6807\u5b8c\u6210\u65f6\u3002\u5c06\u8d44\u6e90\u5e93\u63a8\u5230\u539f\u70b9\u3002\u8003\u8651\u4ee5\u4e0b\u793a\u4f8b\u4ee5\u4e86\u89e3git merge\u547d\u4ee4\u3002\n  <\/div>\n\n    \u5047\u8bbe\u60a8\u6b63\u5728\u4f7f\u7528\u5206\u652f test2 \u3002\u60a8\u73b0\u5728\u4f4d\u4e8etest2\u5206\u652f\u4e0a\uff0c\u5e76\u5bf9\u9879\u76ee\u7684\u6587\u4ef6 newfile1.txt \u8fdb\u884c\u4e86\u4e00\u4e9b\u66f4\u6539\u3002\n  <\/div>\n\n    \u5c06\u6b64\u6587\u4ef6\u6dfb\u52a0\u5230\u5b58\u50a8\u5e93:\n  <\/div>\n\n$ git add newfile1.txt<\/pre>\n<\/code>\n  <\/div>\n
\n    \u73b0\u5728\uff0c\u63d0\u4ea4\u66f4\u6539\u3002\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4:\n  <\/div>\n\n$ git commit-m \"new commit for <\/span>test2 branch.\"<\/span><\/pre>\n<\/code>\n  <\/div>\n
\n    \u8f93\u51fa\u5c06\u5982\u4e0b\u6240\u793a:\n  <\/div>\n\n[test2 a835504] new <\/span>commitfor <\/span>test2 branch\n 1 file changed, 1 insertion(+)<\/pre>\n<\/code>\n  <\/div>\n
\n    \u5c06\u5206\u652f\u5207\u6362\u4e3a\u4e3b\u8282\u70b9:\n  <\/div>\n\n$ git checkout master<\/pre>\n<\/code>\n  <\/div>\n
\n    \u8f93\u51fa:\n  <\/div>\n\nSwitched to branch 'master.'<\/span>\nYour branch is up to date with 'origin\/master.'<\/span><\/pre>\n<\/code>\n  <\/div>\n
\n    \u73b0\u5728\u60a8\u5728master\u5206\u652f\u4e0a\u3002 newfile.txt \u8bf4\uff0c\u6211\u5df2\u5c06\u66f4\u6539\u6dfb\u52a0\u5230\u6211\u7684\u6587\u4ef6\u4e2d\u3002\u4ee5\u4e0b\u547d\u4ee4\u7528\u4e8e\u5c06\u6587\u4ef6\u6dfb\u52a0\u5230\u5b58\u50a8\u5e93\u4e2d\u3002\n  <\/div>\n\n$ git add newfile.txt<\/pre>\n<\/code>\n  <\/div>\n
\n    \u73b0\u5728\u63d0\u4ea4\u6587\u4ef6\u4ee5\u8fdb\u884c\u66f4\u6539:\n  <\/div>\n\n$ git commit-m \" new <\/span>commit made on the master branch.\"<\/span><\/pre>\n<\/code>\n  <\/div>\n
\n    \u8f93\u51fa:\n  <\/div>\n\n[master 7fe5e7a]  new <\/span>commit made on master\n 1 file changed, 1 insertion(+)\nHiMaNshU@HiMaNshU-PC MINGW64 ~\/Desktop\/GitExample2 (master)<\/pre>\n<\/code>\n  <\/div>\n
\n    \u8981\u68c0\u67e5\u65e5\u5fd7\u5386\u53f2\u8bb0\u5f55\uff0c\u8bf7\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u3002\n  <\/div>\n\n$ git log--oneline<\/pre>\n<\/code>\n  <\/div>\n
\n    \u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u5982\u6211\u4eec\u6240\u89c1\u65e5\u5fd7\u5386\u53f2\u8bb0\u5f55\uff0cmaster\u5206\u652f\u4e2d\u6709\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u3002\u5982\u679c\u6211\u60f3\u91cd\u65b0\u5efa\u7acbtest2\u5206\u652f\u7684\u57fa\u7840\uff0c\u8be5\u600e\u4e48\u529e\uff1f\u8bf7\u53c2\u9605\u4e0b\u9762\u7684rebase\u5206\u652f\u65b9\u6848:\n  <\/div>\n Rebase\u5206\u652f<\/h2>\n\n    \u5982\u679c\u6211\u4eec\u6709\u6765\u81ea\u4e0d\u540c\u5206\u652f\u7684\u8bb8\u591a\u63d0\u4ea4\uff0c\u5e76\u4e14\u5e0c\u671b\u5c06\u5176\u5408\u5e76\u5230\u4e00\u4e2a\u5206\u652f\u4e2d\u3002\u4e3a\u6b64\uff0c\u6211\u4eec\u6709\u4e24\u4e2a\u9009\u62e9\uff0c\u8981\u4e48\u53ef\u4ee5\u5408\u5e76\u5b83\uff0c\u8981\u4e48\u5bf9\u5176\u91cd\u65b0\u8bbe\u7f6e\u57fa\u7840\u3002\u91cd\u65b0\u8bbe\u7f6e\u5206\u652f\u7684\u57fa\u7840\u662f\u5f88\u597d\u7684\u3002\n  <\/div>\n\n    \u5728\u4e0a\u9762\u7684\u793a\u4f8b\u4e2d\uff0c\u6211\u4eec\u5df2\u63d0\u4ea4\u5230master\u5206\u652f\uff0c\u5e76\u5e0c\u671b\u5c06\u5176\u57fa\u4e8etest2\u5206\u652f\u3002\u8ba9\u6211\u4eec\u770b\u4e0b\u9762\u7684\u547d\u4ee4:\n  <\/div>\n\n$ git checkout test2<\/pre>\n<\/code>\n  <\/div>\n
\n    \u6b64\u547d\u4ee4\u5c06\u4f7f\u60a8\u4ece\u4e3b\u670d\u52a1\u5668\u5207\u6362\u5230test2\u5206\u652f\u3002\n  <\/div>\n\n    \u8f93\u51fa:\n  <\/div>\n\nSwitched to branch 'test2.'<\/span><\/pre>\n<\/code>\n  <\/div>\n
\n    \u73b0\u5728\u60a8\u5728test2\u5206\u652f\u4e0a\u3002\u56e0\u6b64\uff0c\u60a8\u53ef\u4ee5\u4f7f\u7528master\u5206\u652f\u4e3atest2\u5206\u652f\u91cd\u65b0\u8bbe\u7f6e\u57fa\u7840\u3002\u53c2\u89c1\u4ee5\u4e0b\u547d\u4ee4:\n  <\/div>\n\n$ git rebase master<\/pre>\n<\/code>\n  <\/div>\n
\n    \u6b64\u547d\u4ee4\u5c06\u91cd\u65b0\u5efa\u7acbtest2\u5206\u652f\u7684\u57fa\u7840\uff0c\u5e76\u663e\u793a\u4e3a\u6b63\u5728\u5e94\u7528: test2\u5206\u652f\u4e0a\u7684\u65b0\u63d0\u4ea4\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n\n    \u8f93\u51fa:\n  <\/div>\n   <\/p>\n
 Git\u4ea4\u4e92\u5f0fRebase <\/h2>\n\n    Git\u6709\u52a9\u4e8e\u8fdb\u884c\u4ea4\u4e92\u5f0fRebase\uff1b\u5b83\u662f\u4e00\u4e2a\u5f3a\u5927\u7684\u5de5\u5177\uff0c\u5b83\u5141\u8bb8\u5bf9\u73b0\u6709\u63d0\u4ea4\u8fdb\u884c\u5404\u79cd\u64cd\u4f5c\uff0c\u4f8b\u5982\u7f16\u8f91\uff0c\u91cd\u5199\uff0c\u91cd\u65b0\u6392\u5e8f\u4ee5\u53ca\u66f4\u591a\u64cd\u4f5c\u3002 Interactive Rebase\u53ea\u80fd\u5728\u5f53\u524d\u7b7e\u51fa\u7684\u5206\u652f\u4e0a\u8fdb\u884c\u64cd\u4f5c\u3002\u56e0\u6b64\uff0c\u8bf7\u5728\u8fb9\u680f\u4e0a\u8bbe\u7f6e\u672c\u5730HEAD\u5206\u652f\u3002\n  <\/div>\n\n    \u53ef\u4ee5\u4f7f\u7528rebase\u547d\u4ee4\u8c03\u7528Git\u4ea4\u4e92\u5f0frebase\uff0c\u53ea\u9700\u5728
\n   -i \u4e2d\u8f93\u5165rebase\u547d\u4ee4\u5373\u53ef\u3002\u8fd9\u91cc\u7684\" i \"\u4ee3\u8868\u4e92\u52a8\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u5982\u4e0b:\n  <\/div>\n\n    \u8bed\u6cd5:\n  <\/div>\n\n$ git rebase-i<\/pre>\n<\/code>\n  <\/div>\n
\n    \u5b83\u5c06\u5217\u51fa\u6240\u6709\u53ef\u7528\u7684\u4ea4\u4e92\u5f0f\u9009\u9879\u3002\n  <\/div>\n\n    \u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u5728\u7ed9\u5b9a\u8f93\u51fa\u4e4b\u540e\uff0c\u5b83\u5c06\u6253\u5f00\u5e26\u6709\u53ef\u7528\u9009\u9879\u7684\u7f16\u8f91\u5668\u3002\u8003\u8651\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n\n    \u8f93\u51fa:\n  <\/div>\n   <\/p>\n
\n    \u5f53\u6211\u4eec\u6267\u884cgit Interactive rebase\u547d\u4ee4\u65f6\uff0c\u5b83\u5c06\u6253\u5f00\u5177\u6709\u4ee5\u4e0a\u8f93\u51fa\u7684\u9ed8\u8ba4\u6587\u672c\u7f16\u8f91\u5668\u3002\n  <\/div>\n\n    \u5176\u4e2d\u5305\u542b\u7684\u9009\u9879\u5982\u4e0b\u6240\u793a:\n  <\/div>\n  Pick<\/span>
\n  Reword<\/span>
\n  Edit<\/span>
\n  Squash<\/span>
\n  Fixup<\/span>
\n  Exec<\/span>
\n  Break<\/span>
\n  Drop<\/span>
\n  Label<\/span>
\n  Reset<\/span>
\n  Merge<\/span> <\/p>\n
\n    \u4ee5\u4e0a\u9009\u9879\u901a\u8fc7git-rebase\u6267\u884c\u5176\u7279\u5b9a\u4efb\u52a1\u3002\u8ba9\u6211\u4eec\u7b80\u8981\u5730\u4e86\u89e3\u6bcf\u4e2a\u9009\u9879\u3002\n  <\/div>\n\n    Pick (-p):\n  <\/div>\n\n    \u9009\u62e9\u6b64\u5904\u8868\u793a\u5df2\u5305\u542b\u63d0\u4ea4\u3002\u63d0\u4ea4\u7684\u987a\u5e8f\u53d6\u51b3\u4e8e\u53d8\u57fa\u671f\u95f4\u7684pick\u547d\u4ee4\u7684\u987a\u5e8f\u3002\u5982\u679c\u60a8\u4e0d\u60f3\u6dfb\u52a0\u63d0\u4ea4\uff0c\u5219\u5fc5\u987b\u5220\u9664\u6574\u884c\u3002\n  <\/div>\n\n    Reword (-r):\n  <\/div>\n\n    \u6539\u5199\u4e0epick\u547d\u4ee4\u975e\u5e38\u76f8\u4f3c\u3002 reword\u9009\u9879\u6682\u505c\u4e86rebase\u8fc7\u7a0b\uff0c\u5e76\u63d0\u4f9b\u4e86\u66f4\u6539\u63d0\u4ea4\u6d88\u606f\u7684\u673a\u4f1a\u3002\u5b83\u4e0d\u4f1a\u5f71\u54cd\u63d0\u4ea4\u6240\u505a\u7684\u4efb\u4f55\u66f4\u6539\u3002\n  <\/div>\n\n    Edit (-e):\n  <\/div>\n\n    \u7f16\u8f91\u9009\u9879\u53ef\u7528\u4e8e\u4fee\u6539\u627f\u8bfa\u3002\u4fee\u6539\u65b9\u5f0f\u662f\uff0c\u53ef\u4ee5\u5b8c\u5168\u6dfb\u52a0\u6216\u66f4\u6539\u63d0\u4ea4\u3002\u6211\u4eec\u8fd8\u53ef\u4ee5\u5728rebase\u7ee7\u7eed\u547d\u4ee4\u4e4b\u524d\u8fdb\u884c\u5176\u4ed6\u63d0\u4ea4\u3002\u5b83\u5141\u8bb8\u6211\u4eec\u5c06\u5927\u578b\u63d0\u4ea4\u62c6\u5206\u4e3a\u8f83\u5c0f\u7684\u63d0\u4ea4\u3002\u6b64\u5916\uff0c\u6211\u4eec\u53ef\u4ee5\u5220\u9664\u4e00\u6b21\u63d0\u4ea4\u4e2d\u6240\u505a\u7684\u9519\u8bef\u66f4\u6539\u3002\n  <\/div>\n\n    Squash (-s):\n  <\/div>\n\n    \u901a\u8fc7\u538b\u6241\u9009\u9879\uff0c\u60a8\u53ef\u4ee5\u5c06\u4e24\u4e2a\u6216\u591a\u4e2a\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a\u63d0\u4ea4\u3002\u5b83\u8fd8\u5141\u8bb8\u6211\u4eec\u7f16\u5199\u65b0\u7684\u63d0\u4ea4\u6d88\u606f\u6765\u63cf\u8ff0\u66f4\u6539\u3002\n  <\/div>\n\n    Fixup (-f):\n  <\/div>\n\n    \u7c7b\u4f3c\u4e8e\u58c1\u7403\u547d\u4ee4\u3002\u5b83\u4e22\u5f03\u4e86\u8981\u5408\u5e76\u7684\u63d0\u4ea4\u6d88\u606f\u3002\u8f83\u65e9\u7684\u63d0\u4ea4\u6d88\u606f\u7528\u4e8e\u63cf\u8ff0\u8fd9\u4e24\u4e2a\u66f4\u6539\u3002\n  <\/div>\n\n    Exec (-x):\n  <\/div>\n\n    exec\u9009\u9879\u5141\u8bb8\u60a8\u8fd0\u884c\n  <\/div>\n\n    Break (-b):\n  <\/div>\n\n    break\u9009\u9879\u5c06\u91cd\u65b0\u542f\u52a8\u505c\u5728\u6b63\u786e\u4f4d\u7f6e\u3002\n  <\/div>\n\n    Drop(-d):\n  <\/div>\n\n    \u5b83\u5c06\u5728\u4ee5\u540e\u7ee7\u7eed\u4f7f\u7528' git rebase--continue '\u547d\u4ee4\u91cd\u65b0\u8bbe\u7f6e\u57fa\u7840\u3002\n  <\/div>\n\n    drop\u9009\u9879\u7528\u4e8e\u5220\u9664\u63d0\u4ea4\u3002\n  <\/div>\n\n    Label (-l):\n  <\/div>\n\n    \u6807\u7b7e\u9009\u9879\u662f\n  <\/div>\n\n    Reset (-t):\n  <\/div>\n\n    \u91cd\u7f6e\u9009\u9879\u7528\u4e8e\u91cd\u7f6e\n  <\/div>\n GitMerge vs. Rebase <\/h2>\n\n    \u5bf9\u4e8egit\u7528\u6237\u800c\u8a00\uff0c\u4f55\u65f6\u4f7f\u7528\u5408\u5e76\u547d\u4ee4\u4ee5\u53ca\u4f55\u65f6\u4f7f\u7528rebase\u662f\u6700\u5e38\u89c1\u7684\u4ee4\u4eba\u56f0\u60d1\u7684\u95ee\u9898\u3002\u8fd9\u4e24\u4e2a\u547d\u4ee4\u90fd\u662f\u76f8\u4f3c\u7684\uff0c\u5e76\u4e14\u90fd\u7528\u4e8e\u5408\u5e76\u5b58\u50a8\u5e93\u4e2d\u4e0d\u540c\u5206\u652f\u7684\u63d0\u4ea4\u3002\n  <\/div>\n\n    \u5728\u5171\u4eab\u5206\u652f\u4e2d\u4e0d\u5efa\u8bae\u4f7f\u7528\u91cd\u65b0\u5b58\u50a8\uff0c\u56e0\u4e3a\u91cd\u65b0\u5b58\u50a8\u8fc7\u7a0b\u4f1a\u521b\u5efa\u4e0d\u4e00\u81f4\u7684\u5b58\u50a8\u5e93\u3002\u5bf9\u4e8e\u4e2a\u4eba\u800c\u8a00\uff0c\u91cd\u65b0\u5408\u5e76\u6bd4\u5408\u5e76\u66f4\u6709\u7528\u3002\u5982\u679c\u8981\u67e5\u770b\u5b8c\u6574\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u5219\u5e94\u4f7f\u7528\u5408\u5e76\u3002\u5408\u5e76\u8ddf\u8e2a\u6574\u4e2a\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u800c\u91cd\u65b0\u57fa\u51c6\u5219\u91cd\u5199\u65b0\u7684\u63d0\u4ea4\u5386\u53f2\u3002\n  <\/div>\n\n    Git rebase\u547d\u4ee4\u88ab\u79f0\u4e3agit merge\u7684\u66ff\u4ee3\u65b9\u6cd5\u3002\u4f46\u662f\uff0c\u5b83\u4eec\u6709\u4e00\u4e9b\u4e3b\u8981\u533a\u522b:\n  <\/div>\n\n\n\n\n\n\n\n\n\n\n\n Git Merge <\/td>\n  Git Rebase <\/td>\n<\/tr>\n
\u5408\u5e76\u4f1a\u5728\u5408\u5e76\u65f6\u521b\u5efa\u6700\u7ec8\u63d0\u4ea4\u3002<\/td>\n  Git\u53d8\u57fa\u5728\u53d8\u57fa\u65f6\u4e0d\u4f1a\u521b\u5efa\u4efb\u4f55\u63d0\u4ea4\u3002<\/td>\n<\/tr>\n
\u5b83\u5c06\u6240\u6709\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a\u63d0\u4ea4\u3002<\/td>\n \u5b83\u521b\u5efa\u4e86\u4e00\u6761\u7ebf\u6027\u7684\u63d0\u4ea4\u8f68\u8ff9\u3002<\/td>\n<\/tr>\n
\u5b83\u521b\u5efa\u4e86\u4e00\u4e2a\u56fe\u5f62\u5316\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u53ef\u80fd\u96be\u4ee5\u7406\u89e3\u3002<\/td>\n \u5b83\u521b\u5efa\u4e86\u6613\u4e8e\u7406\u89e3\u7684\u7ebf\u6027\u5386\u53f2\u8bb0\u5f55\u3002<\/td>\n<\/tr>\n
\u5408\u5e76\u4e24\u4e2a\u5206\u652f\u662f\u5b89\u5168\u7684\u3002<\/td>\n  Git\u7684\"\u53d8\u57fa\"\u5904\u7406\u4e86\u4e25\u91cd\u7684\u64cd\u4f5c\u3002<\/td>\n<\/tr>\n
\u53ef\u4ee5\u5728\u516c\u5171\u548c\u79c1\u4eba\u5206\u652f\u673a\u6784\u4e0a\u8fdb\u884c\u5408\u5e76\u3002<\/td>\n \u5728\u516c\u5171\u5206\u652f\u673a\u6784\u4e0a\u4f7f\u7528\u57fa\u7840\u8c03\u6574\u662f\u9519\u8bef\u7684\u9009\u62e9\u3002<\/td>\n<\/tr>\n
\u5408\u5e76\u5c06\u529f\u80fd\u5206\u652f\u7684\u5185\u5bb9\u4e0e\u4e3b\u5206\u652f\u96c6\u6210\u5728\u4e00\u8d77\u3002\u56e0\u6b64\uff0c\u66f4\u6539\u4e86master\u5206\u652f\uff0c\u5e76\u4e14\u7279\u5f81\u5206\u652f\u5386\u53f2\u8bb0\u5f55\u4fdd\u6301\u4e00\u81f4\u3002<\/td>\n \u91cd\u65b0\u8bbe\u7f6emaster\u5206\u652f\u53ef\u80fd\u4f1a\u5f71\u54cd\u529f\u80fd\u5206\u652f\u3002<\/td>\n<\/tr>\n
\u5408\u5e76\u4f1a\u4fdd\u7559\u5386\u53f2\u8bb0\u5f55\u3002<\/td>\n  Rebasing\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\u3002<\/td>\n<\/tr>\n
 Git\u5408\u5e76\u4f1a\u7acb\u5373\u663e\u793a\u6240\u6709\u51b2\u7a81\u3002<\/td>\n  Git rebase\u4e00\u5bf9\u4e00\u5448\u73b0\u51b2\u7a81\u3002<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
\n <\/body>
\n<\/html><\/p>\n","protected":false},"excerpt":{"rendered":"Git Rebasezh-cn","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[149],"tags":[],"class_list":["post-1643","post","type-post","status-publish","format-standard","hentry","category-gitjc"],"_links":{"self":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts\/1643"}],"collection":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/comments?post=1643"}],"version-history":[{"count":0,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts\/1643\/revisions"}],"wp:attachment":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/media?parent=1643"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/categories?post=1643"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/tags?post=1643"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}

Git Merge <\/td>\n	Git Rebase <\/td>\n<\/tr>\n
\u5408\u5e76\u4f1a\u5728\u5408\u5e76\u65f6\u521b\u5efa\u6700\u7ec8\u63d0\u4ea4\u3002<\/td>\n	Git\u53d8\u57fa\u5728\u53d8\u57fa\u65f6\u4e0d\u4f1a\u521b\u5efa\u4efb\u4f55\u63d0\u4ea4\u3002<\/td>\n<\/tr>\n
\u5b83\u5c06\u6240\u6709\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a\u63d0\u4ea4\u3002<\/td>\n	\u5b83\u521b\u5efa\u4e86\u4e00\u6761\u7ebf\u6027\u7684\u63d0\u4ea4\u8f68\u8ff9\u3002<\/td>\n<\/tr>\n
\u5b83\u521b\u5efa\u4e86\u4e00\u4e2a\u56fe\u5f62\u5316\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u53ef\u80fd\u96be\u4ee5\u7406\u89e3\u3002<\/td>\n	\u5b83\u521b\u5efa\u4e86\u6613\u4e8e\u7406\u89e3\u7684\u7ebf\u6027\u5386\u53f2\u8bb0\u5f55\u3002<\/td>\n<\/tr>\n
\u5408\u5e76\u4e24\u4e2a\u5206\u652f\u662f\u5b89\u5168\u7684\u3002<\/td>\n	Git\u7684\"\u53d8\u57fa\"\u5904\u7406\u4e86\u4e25\u91cd\u7684\u64cd\u4f5c\u3002<\/td>\n<\/tr>\n
\u53ef\u4ee5\u5728\u516c\u5171\u548c\u79c1\u4eba\u5206\u652f\u673a\u6784\u4e0a\u8fdb\u884c\u5408\u5e76\u3002<\/td>\n	\u5728\u516c\u5171\u5206\u652f\u673a\u6784\u4e0a\u4f7f\u7528\u57fa\u7840\u8c03\u6574\u662f\u9519\u8bef\u7684\u9009\u62e9\u3002<\/td>\n<\/tr>\n
\u5408\u5e76\u5c06\u529f\u80fd\u5206\u652f\u7684\u5185\u5bb9\u4e0e\u4e3b\u5206\u652f\u96c6\u6210\u5728\u4e00\u8d77\u3002\u56e0\u6b64\uff0c\u66f4\u6539\u4e86master\u5206\u652f\uff0c\u5e76\u4e14\u7279\u5f81\u5206\u652f\u5386\u53f2\u8bb0\u5f55\u4fdd\u6301\u4e00\u81f4\u3002<\/td>\n	\u91cd\u65b0\u8bbe\u7f6emaster\u5206\u652f\u53ef\u80fd\u4f1a\u5f71\u54cd\u529f\u80fd\u5206\u652f\u3002<\/td>\n<\/tr>\n
\u5408\u5e76\u4f1a\u4fdd\u7559\u5386\u53f2\u8bb0\u5f55\u3002<\/td>\n	Rebasing\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\u3002<\/td>\n<\/tr>\n
Git\u5408\u5e76\u4f1a\u7acb\u5373\u663e\u793a\u6240\u6709\u51b2\u7a81\u3002<\/td>\n	Git rebase\u4e00\u5bf9\u4e00\u5448\u73b0\u51b2\u7a81\u3002<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n \n <\/body> \n<\/html><\/p>\n","protected":false},"excerpt":{"rendered":"Git Rebasezh-cn","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[149],"tags":[],"class_list":["post-1643","post","type-post","status-publish","format-standard","hentry","category-gitjc"],"_links":{"self":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts\/1643"}],"collection":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/comments?post=1643"}],"version-history":[{"count":0,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts\/1643\/revisions"}],"wp:attachment":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/media?parent=1643"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/categories?post=1643"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/tags?post=1643"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}