{"id":899,"date":"2024-08-19T14:36:30","date_gmt":"2024-08-19T06:36:30","guid":{"rendered":"https:\/\/www.chencuo.top\/?p=899"},"modified":"2024-08-19T14:36:30","modified_gmt":"2024-08-19T06:36:30","slug":"git%e4%bd%bf%e7%94%a8%e6%93%8d%e4%bd%9c","status":"publish","type":"post","link":"https:\/\/www.chencuo.top\/?p=899","title":{"rendered":"git\u4f7f\u7528\u64cd\u4f5c"},"content":{"rendered":"\n<h2 class=\"wp-block-heading\">\u6982\u5ff5\uff1a<\/h2>\n\n\n\n<p>Git\u662f\u4e00\u4e2a\u7248\u672c\u7ba1\u7406\u63a7\u5236\u7cfb\u7edf\uff08\u7f29\u5199VCS\uff09\uff0c\u5b83\u53ef\u4ee5\u5728\u4efb\u4f55\u65f6\u95f4\u70b9\uff0c\u5c06\u6587\u6863\u7684\u72b6\u6001\u4f5c\u4e3a\u66f4\u65b0\u8bb0\u5f55\u4fdd\u5b58\u8d77\u6765\uff0c\u4e5f\u53ef\u4ee5\u5728\u4efb\u4f55\u65f6\u95f4\u70b9\uff0c\u5c06\u66f4\u65b0\u8bb0\u5f55\u6062\u590d\u56de\u6765\u3002<\/p>\n\n\n\n<p>\u5728\u5f00\u53d1\u4e2d\uff0cGit\u5df2\u6210\u4e3a\u73b0\u5728\u4e3b\u6d41\u7684\u4e00\u79cd\u4ee3\u7801\u6258\u7ba1\u6280\u672f\uff08\u7248\u672c\u7ba1\u7406\u5de5\u5177\uff09\uff0c\u57fa\u672c\u4e0a\u5927\u591a\u6570\u7684\u516c\u53f8\u90fd\u5728\u4f7f\u7528Git\u8fdb\u884c\u534f\u540c\u5f00\u53d1\u3002\u5f88\u591a\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0\u4e5f\u662f\u57fa\u4e8eGit\u6765\u5b9e\u73b0\u7684\u3002<\/p>\n\n\n\n<p>Git\u662fgithub\u5b9e\u73b0\u9879\u76ee\u4e0a\u4f20\u7684\u4e3b\u8981\u5b9e\u73b0\u65b9\u5f0f\u3002\u5b9e\u73b0\u672c\u5730\u9879\u76ee+github\u9879\u76ee+\u7ebf\u4e0a\u90e8\u7f72\u9879\u76ee\u4e09\u5408\u4e00\u7684\u91cd\u8981\u5b9e\u73b0\u65b9\u5f0f<br><\/p>\n\n\n\n<h2 class=\"wp-block-heading\">git\u4f7f\u7528<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">\u56db\u4e2a\u533a\u57df<\/h3>\n\n\n\n<p><strong>\u5de5\u4f5c<u><strong>\u533a(W<\/strong><\/u>o<u><strong>rking<\/strong><\/u><\/strong>\u00a0<strong>Di<u><strong>r<\/strong><\/u>ectory)<\/strong>                            &#8212;&#8212;<strong>\u5c31\u662f\u4f60\u5728\u7535\u8111\u91cc\u80fd\u5b9e\u9645\u770b\u5230\u7684\u76ee\u5f55<\/strong><\/p>\n\n\n\n<p><strong>\u6682\u5b58\u533a(Stage\/Index)<\/strong>                                       &#8212;&#8212;<strong>\u6682\u5b58\u533a\u4e5f\u53eb\u7d22\u5f15\uff0c\u7528<u><strong>\u6765\u4e34<\/strong><\/u>\u65f6\u5b58\u653e\u672a\u63d0\u4ea4\u7684\u5185\u5bb9\uff0c\u4e00\u822c\u5728.git\u76ee\u5f55\u4e0b\u7684index\u4e2d<\/strong><\/p>\n\n\n\n<p><strong>\u672c\u5730\u4ed3\u5e93(Repository)<\/strong>                                     &#8212;&#8212;<strong>Git\u5728\u672c\u5730\u7684\u7248\u672c\u5e93\uff0c\u4ed3\u5e93\u4fe1\u606f\u5b58\u50a8\u5728.git\u8fd9\u4e2a\u9690\u85cf\u76ee\u5f55\u4e2d<\/strong><\/p>\n\n\n\n<p><strong>\u8fdc\u7a0b\u4ed3\u5e93(Remote<\/strong>\u00a0<strong>Repository)<\/strong>                         &#8212;&#8212;-<strong>\u6258\u7ba1\u5728\u8fdc\u7a0b\u670d\u52a1\u5668\u4e0a\u7684\u4ed3\u5e93\u3002\u5e38\u7528\u7684\u6709GitHub\u3001GitLab\u3001Gitee<\/strong><\/p>\n\n\n\n<p><\/p>\n\n\n\n<p><\/p>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-1\">\u521b\u5efa\u4ed3\u5e93\u547d\u4ee4<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td><code>git init<\/code><\/td><td>\u521d\u59cb\u5316\u4ed3\u5e93\uff0c\u5728\u5f53\u524d\u76ee\u5f55\u65b0\u5efa\u4e00\u4e2aGit\u4ee3\u7801\u5e93\uff0c\u57fa\u672c\u4e0a\u662f\u521b\u5efa\u4e00\u4e2a\u5177\u6709<code>objects<\/code>\uff0c<code>refs\/head<\/code>\uff0c<code>refs\/tags<\/code>\u548c\u6a21\u677f\u6587\u4ef6\u7684<code>.git<\/code>\u76ee\u5f55\u3002<\/td><\/tr><tr><td><code>git clone<\/code>[url]<\/td><td>\u62f7\u8d1d\u4e00\u4efd<strong>\u8fdc\u7a0b\u4ed3\u5e93<\/strong>\uff0c\u4e5f\u5c31\u662f\u4e0b\u8f7d\u4e00\u4e2a\u9879\u76ee\u548c\u5b83\u7684\u6574\u4e2a\u4ee3\u7801\u5386\u53f2\u3002<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-2\">\u914d\u7f6e<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td><code>git config --list<\/code><\/td><td>\u663e\u793a\u5f53\u524d\u7684<strong>Git\u914d\u7f6e<\/strong><\/td><\/tr><tr><td>git config -e [&#8211;global]<\/td><td>\u7f16\u8f91Git\u914d\u7f6e\u6587\u4ef6\u3002<\/td><\/tr><tr><td>git config [&#8211;global] user.name &#8220;[name]&#8221;<br>git config [&#8211;global] user.email &#8220;[email address]&#8221;<\/td><td>\u8bbe\u7f6e\u63d0\u4ea4\u4ee3\u7801\u65f6\u7684<strong>\u7528\u6237\u4fe1\u606f<\/strong><\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-3\">\u589e\u52a0 \/ \u5220\u9664\u6587\u4ef6<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td><code>git add [file1] [file2] ...<\/code><\/td><td>\u6dfb\u52a0<strong>\u6307\u5b9a\u6587\u4ef6<\/strong>\u5230\u6682\u5b58\u533a<\/td><\/tr><tr><td>git add [dir]<\/td><td>\u6dfb\u52a0<strong>\u6307\u5b9a\u76ee\u5f55<\/strong>\u5230\u6682\u5b58\u533a\uff0c\u5305\u62ec\u5b50\u76ee\u5f55<\/td><\/tr><tr><td>git add .<\/td><td>\u6dfb\u52a0\u5f53\u524d\u76ee\u5f55\u7684<strong>\u6240\u6709\u6587\u4ef6<\/strong>\u5230\u6682\u5b58\u533a<\/td><\/tr><tr><td>git add -p<\/td><td>\u6dfb\u52a0\u6bcf\u4e2a\u53d8\u5316\u524d\uff0c\u90fd\u4f1a\u8981\u6c42\u786e\u8ba4&lt;br\/&gt; \u5bf9\u4e8e\u540c\u4e00\u4e2a\u6587\u4ef6\u7684\u591a\u5904\u53d8\u5316\uff0c\u53ef\u4ee5\u5b9e\u73b0<strong>\u5206\u6b21\u63d0\u4ea4<\/strong><\/td><\/tr><tr><td>git rm [file1] [file2] &#8230;<\/td><td><strong>\u5220\u9664<\/strong>\u5de5\u4f5c\u533a\u6587\u4ef6\uff0c\u5e76\u4e14\u5c06\u8fd9\u6b21\u5220\u9664\u653e\u5165\u6682\u5b58\u533a<\/td><\/tr><tr><td>git rm &#8211;cached [file]<\/td><td>\u505c\u6b62\u8ffd\u8e2a\u6307\u5b9a\u6587\u4ef6\uff0c\u4f46\u8be5\u6587\u4ef6\u4f1a\u4fdd\u7559\u5728\u5de5\u4f5c\u533a<\/td><\/tr><tr><td>git mv [file-original] [file-renamed]<\/td><td><strong>\u6539\u540d<\/strong>\u6587\u4ef6\uff0c\u5e76\u4e14\u5c06\u8fd9\u4e2a\u6539\u540d\u653e\u5165\u6682\u5b58\u533a<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-4\">\u4ee3\u7801\u63d0\u4ea4<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td><code>git commit -m [message]<\/code><\/td><td>\u63d0\u4ea4\u6682\u5b58\u533a\u5230\u4ed3\u5e93\u533a<\/td><\/tr><tr><td>git commit [file1] [file2] &#8230; -m [message]<\/td><td>\u63d0\u4ea4\u6682\u5b58\u533a\u7684<strong>\u6307\u5b9a\u6587\u4ef6<\/strong>\u5230\u4ed3\u5e93\u533a<\/td><\/tr><tr><td>git commit -a<\/td><td>\u63d0\u4ea4\u5de5\u4f5c\u533a<strong>\u81ea\u4e0a\u6b21commit\u4e4b\u540e<\/strong>\u7684\u53d8\u5316\uff0c\u76f4\u63a5\u5230\u4ed3\u5e93\u533a<\/td><\/tr><tr><td>git commit -v<\/td><td>\u63d0\u4ea4\u65f6\u663e\u793a<strong>\u6240\u6709diff\u4fe1\u606f<\/strong><\/td><\/tr><tr><td>git commit &#8211;amend -m [message]<\/td><td>\u4f7f\u7528\u4e00\u6b21\u65b0\u7684commit\uff0c\u66ff\u4ee3\u4e0a\u4e00\u6b21\u63d0\u4ea4&lt;br\/&gt;\u5982\u679c\u4ee3\u7801\u6ca1\u6709\u4efb\u4f55\u65b0\u53d8\u5316\uff0c\u5219\u7528\u6765\u6539\u5199\u4e0a\u4e00\u6b21commit\u7684\u63d0\u4ea4\u4fe1\u606f<\/td><\/tr><tr><td>git commit &#8211;amend [file1] [file2] &#8230;<\/td><td><strong>\u91cd\u505a\u4e0a\u4e00\u6b21commit<\/strong>\uff0c\u5e76\u5305\u62ec\u6307\u5b9a\u6587\u4ef6\u7684\u65b0\u53d8\u5316<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-5\">\u5206\u652f<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td>git branch<\/td><td>\u5217\u51fa\u6240\u6709<strong>\u672c\u5730\u5206\u652f<\/strong><\/td><\/tr><tr><td>git branch -r<\/td><td>\u5217\u51fa\u6240\u6709<strong>\u8fdc\u7a0b\u5206\u652f<\/strong><\/td><\/tr><tr><td>git branch -a<\/td><td>\u5217\u51fa\u6240\u6709\u672c\u5730\u5206\u652f\u548c<strong>\u8fdc\u7a0b\u5206\u652f<\/strong><\/td><\/tr><tr><td>git branch [branch-name]<\/td><td>\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u4f46\u4f9d\u7136\u505c\u7559\u5728\u5f53\u524d\u5206\u652f<\/td><\/tr><tr><td>git checkout -b [branch]<\/td><td>\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u5e76\u5207\u6362\u5230\u8be5\u5206\u652f<\/td><\/tr><tr><td>git branch [branch] [commit]<\/td><td>\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u6307\u5411\u6307\u5b9acommit<\/td><\/tr><tr><td>git branch &#8211;track [branch] [remote-branch]<\/td><td>\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u4e0e\u6307\u5b9a\u7684\u8fdc\u7a0b\u5206\u652f\u5efa\u7acb\u8ffd\u8e2a\u5173\u7cfb<\/td><\/tr><tr><td>git checkout [branch-name]<\/td><td>\u5207\u6362\u5230\u6307\u5b9a\u5206\u652f\uff0c\u5e76\u66f4\u65b0\u5de5\u4f5c\u533a<\/td><\/tr><tr><td>git checkout &#8211;<\/td><td><strong>\u5207\u6362<\/strong>\u5230\u4e0a\u4e00\u4e2a\u5206\u652f<\/td><\/tr><tr><td>git branch &#8211;set-upstream [branch] [remote-branch]<\/td><td>\u5efa\u7acb\u8ffd\u8e2a\u5173\u7cfb\uff0c\u5728\u73b0\u6709\u5206\u652f\u4e0e\u6307\u5b9a\u7684\u8fdc\u7a0b\u5206\u652f\u4e4b\u95f4<\/td><\/tr><tr><td>git merge [branch]<\/td><td><strong>\u5408\u5e76<\/strong>\u6307\u5b9a\u5206\u652f\u5230\u5f53\u524d\u5206\u652f<\/td><\/tr><tr><td>git cherry-pick [commit]<\/td><td>\u9009\u62e9\u4e00\u4e2acommit\uff0c\u5408\u5e76\u8fdb\u5f53\u524d\u5206\u652f<\/td><\/tr><tr><td>git branch -d [branch-name]<\/td><td><strong>\u5220\u9664\u5206\u652f<\/strong><\/td><\/tr><tr><td>git push origin &#8211;delete [branch-name]<br>\u6216<br>git branch -dr [remote\/branch]<\/td><td><strong>\u5220\u9664\u8fdc\u7a0b\u5206\u652f<\/strong><\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-6\">\u6807\u7b7e<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td>git tag<\/td><td>\u5217\u51fa\u6240\u6709tag<\/td><\/tr><tr><td>git tag [tag]<\/td><td>\u65b0\u5efa\u4e00\u4e2atag\u5728\u5f53\u524dcommit<\/td><\/tr><tr><td>git tag [tag] [commit]<\/td><td>\u65b0\u5efa\u4e00\u4e2atag\u5728\u6307\u5b9acommit<\/td><\/tr><tr><td>git tag -d [tag]<\/td><td>\u5220\u9664<strong>\u672c\u5730tag<\/strong><\/td><\/tr><tr><td>git push origin :refs\/tags\/[tagName]<\/td><td>\u5220\u9664<strong>\u8fdc\u7a0btag<\/strong><\/td><\/tr><tr><td>git show [tag]<\/td><td>\u67e5\u770btag\u4fe1\u606f<\/td><\/tr><tr><td>git push [remote] [tag]<\/td><td>\u63d0\u4ea4<strong>\u6307\u5b9atag<\/strong><\/td><\/tr><tr><td>git push [remote] &#8211;tags<\/td><td>\u63d0\u4ea4<strong>\u6240\u6709tag<\/strong><\/td><\/tr><tr><td>git checkout -b [branch] [tag]<\/td><td>\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u6307\u5411\u67d0\u4e2atag<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-7\">\u67e5\u770b\u4fe1\u606f\u548c\u5386\u53f2<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td>git status<\/td><td>\u663e\u793a\u6709\u53d8\u66f4\u7684\u6587\u4ef6<\/td><\/tr><tr><td>git log<\/td><td>\u663e\u793a\u5f53\u524d\u5206\u652f\u7684\u7248\u672c\u5386\u53f2<\/td><\/tr><tr><td>git log &#8211;stat<\/td><td>\u663e\u793acommit\u5386\u53f2\uff0c\u4ee5\u53ca\u6bcf\u6b21commit\u53d1\u751f\u53d8\u66f4\u7684\u6587\u4ef6<\/td><\/tr><tr><td>git log -S [keyword]<\/td><td>\u641c\u7d22\u63d0\u4ea4\u5386\u53f2\uff0c\u6839\u636e\u5173\u952e\u8bcd<\/td><\/tr><tr><td>git log [tag] HEAD &#8211;pretty=format:%s<\/td><td>\u663e\u793a\u67d0\u4e2acommit\u4e4b\u540e\u7684\u6240\u6709\u53d8\u52a8\uff0c\u6bcf\u4e2acommit\u5360\u636e\u4e00\u884c<\/td><\/tr><tr><td>git log [tag] HEAD &#8211;grep feature<\/td><td>\u663e\u793a\u67d0\u4e2acommit\u4e4b\u540e\u7684\u6240\u6709\u53d8\u52a8\uff0c\u5176&#8221;\u63d0\u4ea4\u8bf4\u660e&#8221;\u5fc5\u987b\u7b26\u5408\u641c\u7d22\u6761\u4ef6<\/td><\/tr><tr><td>git log &#8211;follow [file]<br>\u6216<br>git whatchanged [file]<\/td><td>\u663e\u793a\u67d0\u4e2a\u6587\u4ef6\u7684\u7248\u672c\u5386\u53f2\uff0c\u5305\u62ec\u6587\u4ef6\u6539\u540d<\/td><\/tr><tr><td>git log -p [file]<\/td><td>\u663e\u793a\u6307\u5b9a\u6587\u4ef6\u76f8\u5173\u7684\u6bcf\u4e00\u6b21diff<\/td><\/tr><tr><td>git log -5 &#8211;pretty &#8211;oneline<\/td><td>\u663e\u793a\u8fc7\u53bb5\u6b21\u63d0\u4ea4<\/td><\/tr><tr><td>git shortlog -sn<\/td><td>\u663e\u793a\u6240\u6709\u63d0\u4ea4\u8fc7\u7684\u7528\u6237\uff0c\u6309\u63d0\u4ea4\u6b21\u6570\u6392\u5e8f<\/td><\/tr><tr><td>git blame [file]<\/td><td>\u663e\u793a\u6307\u5b9a\u6587\u4ef6\u662f\u4ec0\u4e48\u4eba\u5728\u4ec0\u4e48\u65f6\u95f4\u4fee\u6539\u8fc7<\/td><\/tr><tr><td>git diff<\/td><td>\u663e\u793a<strong>\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a<\/strong>\u7684\u5dee\u5f02<\/td><\/tr><tr><td>git diff &#8211;cached [file]<\/td><td>\u663e\u793a<strong>\u6682\u5b58\u533a\u548c\u4e0a\u4e00\u4e2acommit<\/strong>\u7684\u5dee\u5f02<\/td><\/tr><tr><td>git diff HEAD<\/td><td>\u663e\u793a<strong>\u5de5\u4f5c\u533a\u4e0e\u5f53\u524d\u5206\u652f\u6700\u65b0commit\u4e4b\u95f4<\/strong>\u7684\u5dee\u5f02<\/td><\/tr><tr><td>git diff [first-branch]&#8230;[second-branch]<\/td><td>\u663e\u793a<strong>\u4e24\u6b21\u63d0\u4ea4\u4e4b\u95f4<\/strong>\u7684\u5dee\u5f02<\/td><\/tr><tr><td>git diff &#8211;shortstat &#8220;@{0 day ago}&#8221;<\/td><td><strong>\u663e\u793a\u4eca\u5929\u4f60\u5199\u4e86\u591a\u5c11\u884c\u4ee3\u7801<\/strong><\/td><\/tr><tr><td>git show [commit]<\/td><td>\u663e\u793a\u67d0\u6b21\u63d0\u4ea4\u7684\u5143\u6570\u636e\u548c\u5185\u5bb9\u53d8\u5316<\/td><\/tr><tr><td>git show &#8211;name-only [commit]<\/td><td>\u663e\u793a\u67d0\u6b21\u63d0\u4ea4\u53d1\u751f\u53d8\u5316\u7684\u6587\u4ef6<\/td><\/tr><tr><td>git show [commit]:[filename]<\/td><td>\u663e\u793a\u67d0\u6b21\u63d0\u4ea4\u65f6\uff0c\u67d0\u4e2a\u6587\u4ef6\u7684\u5185\u5bb9<\/td><\/tr><tr><td>git reflog<\/td><td>\u663e\u793a\u5f53\u524d\u5206\u652f\u7684\u6700\u8fd1\u51e0\u6b21\u63d0\u4ea4<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-8\">\u8fdc\u7a0b\u540c\u6b65<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td>git fetch [remote]<\/td><td>\u4e0b\u8f7d\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6240\u6709\u53d8\u52a8\uff08<strong>\u8fdc\u7a0b\u65b0\u589e\u6216\u5220\u9664\u5206\u652f\u90fd\u80fd\u663e\u793a<\/strong>\uff09<\/td><\/tr><tr><td>git remote -v<\/td><td>\u663e\u793a<strong>\u6240\u6709\u8fdc\u7a0b\u4ed3\u5e93<\/strong><\/td><\/tr><tr><td>git config [&#8211;global] user.name &#8220;[name]&#8221;<br>git config [&#8211;global] user.email &#8220;[email address]&#8221;<\/td><td>\u8bbe\u7f6e\u63d0\u4ea4\u4ee3\u7801\u65f6\u7684\u7528\u6237\u4fe1\u606f<\/td><\/tr><tr><td>git remote show [remote]<\/td><td>\u663e\u793a\u67d0\u4e2a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u4fe1\u606f<\/td><\/tr><tr><td>git remote add [shortname] [url]<\/td><td>\u589e\u52a0\u4e00\u4e2a\u65b0\u7684\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5e76\u547d\u540d<\/td><\/tr><tr><td>git pull [remote] [branch]<\/td><td>\u53d6\u56de\u8fdc\u7a0b\u4ed3\u5e93\u7684\u53d8\u5316\uff0c\u5e76\u4e0e\u672c\u5730\u5206\u652f\u5408\u5e76<\/td><\/tr><tr><td>git push [remote] [branch]<\/td><td>\u4e0a\u4f20\u672c\u5730\u6307\u5b9a\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/td><\/tr><tr><td>git push [remote] &#8211;force<\/td><td>\u5f3a\u884c\u63a8\u9001\u5f53\u524d\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5373\u4f7f\u6709\u51b2\u7a81<\/td><\/tr><tr><td>git push [remote] &#8211;all<\/td><td>\u63a8\u9001\u6240\u6709\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-9\">\u64a4\u9500<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td><code>git checkout [file]<\/code><\/td><td>\u6062\u590d\u6682\u5b58\u533a\u7684\u6307\u5b9a\u6587\u4ef6\u5230\u5de5\u4f5c\u533a<\/td><\/tr><tr><td>git checkout [commit] [file]<\/td><td>\u6062\u590d\u67d0\u4e2acommit\u7684\u6307\u5b9a\u6587\u4ef6\u5230\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a<\/td><\/tr><tr><td>git checkout .<\/td><td>\u6062\u590d\u6682\u5b58\u533a\u7684\u6240\u6709\u6587\u4ef6\u5230\u5de5\u4f5c\u533a<\/td><\/tr><tr><td>git reset [file]<\/td><td>\u91cd\u7f6e\u6682\u5b58\u533a\u7684\u6307\u5b9a\u6587\u4ef6\uff0c\u4e0e\u4e0a\u4e00\u6b21commit\u4fdd\u6301\u4e00\u81f4\uff0c\u4f46\u5de5\u4f5c\u533a\u4e0d\u53d8<\/td><\/tr><tr><td>git reset &#8211;hard<\/td><td>\u91cd\u7f6e\u6682\u5b58\u533a\u4e0e\u5de5\u4f5c\u533a\uff0c\u4e0e\u4e0a\u4e00\u6b21commit\u4fdd\u6301\u4e00\u81f4<\/td><\/tr><tr><td>git reset [commit]<\/td><td>\u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684\u6307\u9488\u4e3a\u6307\u5b9acommit\uff0c\u540c\u65f6\u91cd\u7f6e\u6682\u5b58\u533a\uff0c\u4f46\u5de5\u4f5c\u533a\u4e0d\u53d8<\/td><\/tr><tr><td>git reset &#8211;hard [commit]<\/td><td>\u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684HEAD\u4e3a\u6307\u5b9acommit\uff0c\u540c\u65f6\u91cd\u7f6e\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\uff0c\u4e0e\u6307\u5b9acommit\u4e00\u81f4<\/td><\/tr><tr><td>git reset &#8211;keep [commit]<\/td><td>\u91cd\u7f6e\u5f53\u524dHEAD\u4e3a\u6307\u5b9acommit\uff0c\u4f46\u4fdd\u6301\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u4e0d\u53d8<\/td><\/tr><tr><td>git revert [commit]<\/td><td>\u65b0\u5efa\u4e00\u4e2acommit\uff0c\u7528\u6765\u64a4\u9500\u6307\u5b9acommit&lt;br\/&gt;\u540e\u8005\u7684\u6240\u6709\u53d8\u5316\u90fd\u5c06\u88ab\u524d\u8005\u62b5\u6d88\uff0c\u5e76\u4e14\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f<\/td><\/tr><tr><td>git stash<\/td><td>\u6682\u65f6\u5c06\u672a\u63d0\u4ea4\u7684\u53d8\u5316\u79fb\u9664\uff0c\u7a0d\u540e\u518d\u79fb\u5165<\/td><\/tr><tr><td>git stash pop<\/td><td>\u6682\u65f6\u5c06\u672a\u63d0\u4ea4\u7684\u53d8\u5316\u79fb\u9664\uff0c\u7a0d\u540e\u518d\u79fb\u5165<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-4-10\">\u5176\u4ed6<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>\u547d\u4ee4<\/th><th>\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td>git archive<\/td><td>\u751f\u6210\u4e00\u4e2a\u53ef\u4f9b\u53d1\u5e03\u7684\u538b\u7f29\u5305<\/td><\/tr><tr><td>git repack<\/td><td>\u6253\u5305\u672a\u5f52\u6863\u6587\u4ef6<\/td><\/tr><tr><td>git count-objects<\/td><td>\u8ba1\u7b97\u89e3\u5305\u7684\u5bf9\u8c61\u6570\u91cf<\/td><\/tr><tr><td>git help<br>\u6216<br>git &#8211;help<\/td><td><strong>Git\u5e2e\u52a9<\/strong>\uff0c\u67e5\u770bgit\u76f8\u5173\u547d\u4ee4\uff0c\u5982\u679c\u60f3\u770b\u67d0\u4e2a\u7279\u5b9a\u547d\u4ee4\u7684\u5177\u4f53\u7ec6\u8282\uff0c\u53ef\u4f7f\u7528git [\u547d\u4ee4] &#8211;help,\u5982&nbsp;<strong>git commit &#8211;help<\/strong>&nbsp;\u8868\u793a\u67e5\u770b\u63d0\u4ea4\u76f8\u5173\u547d\u4ee4\u7684\u5e2e\u52a9<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h2 class=\"wp-block-heading\" id=\"item-5\">Git\u64cd\u4f5c\u6d41\u7a0b<\/h2>\n\n\n\n<p>git\u7684\u64cd\u4f5c\u5f80\u5f80\u90fd\u4e0d\u662f\u4e00\u4e2a\u547d\u4ee4\u80fd\u89e3\u51b3\u7684\uff0c\u5c31\u6bd4\u5982\u4e0b\u56fe\u6240\u793a\uff0c\u5355\u5355<strong>\u4ee3\u7801\u63d0\u4ea4\u548c\u540c\u6b65\u4ee3\u7801<\/strong>\uff0c\u5c31\u6d89\u53ca\u52306\u4e2a\u547d\u4ee4\u7684\u7ec4\u5408\u3002<\/p>\n\n\n\n<p>\u770b\u5b8c\u4e86git\u547d\u4ee4\u5927\u5168\uff0c\u8fd9\u8282\u5217\u4e3e\u4e86\u5b9e\u9645\u64cd\u4f5c\u4e2d\u7684\u4e0d\u540c\u573a\u666f\uff0c\u4e3a\u5927\u5bb6\u4e00\u4e00\u89e3\u7b54\u5982\u4f55\u7ec4\u5408\u4e0d\u540cgit\u547d\u4ee4\uff0c\u8fdb\u884cgit\u7684\u64cd\u4f5c\u6d41\u7a0b\u3002<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u4ee3\u7801\u63d0\u4ea4\u548c\u540c\u6b65\u4ee3\u7801<\/li>\n<\/ul>\n\n\n\n<p>&lt;img width=&#8221;613&#8243; height=&#8221;292&#8243; alt=&#8221;git\u4ee3\u7801\u6bd4\u8f83\u548c\u540c\u6b65\u4ee3\u7801&#8221; src=&#8221;https:\/\/img.beierblog.com\/20220717blog\/git-four-areas.png&#8221;\/&gt;<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u4ee3\u7801\u64a4\u9500\u548c\u64a4\u9500\u540c\u6b65<\/li>\n<\/ul>\n\n\n\n<p>&lt;img width=&#8221;613&#8243; height=&#8221;292&#8243; alt=&#8221;git\u4ee3\u7801\u64a4\u9500\u548c\u64a4\u9500\u540c\u6b65&#8221; src=&#8221;https:\/\/img.beierblog.com\/20220717blog\/git-five-states_7a70f7856af64ecfa3d4054518da5eb2.png&#8221;\/&gt;<\/p>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-5-11\">\u4ee3\u7801\u63d0\u4ea4\u548c\u540c\u6b65\u4ee3\u7801<\/h3>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u7b2c\u96f6\u6b65: \u5de5\u4f5c\u533a\u4e0e\u4ed3\u5e93\u4fdd\u6301\u4e00\u81f4<\/li>\n\n\n\n<li>\u7b2c\u4e00\u6b65: \u6587\u4ef6\u589e\u5220\u6539\uff0c\u53d8\u4e3a\u5df2\u4fee\u6539\u72b6\u6001<\/li>\n\n\n\n<li>\u7b2c\u4e8c\u6b65: git add \uff0c\u53d8\u4e3a\u5df2\u6682\u5b58\u72b6\u6001<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git status\n$ git add --all # \u5f53\u524d\u9879\u76ee\u4e0b\u7684\u6240\u6709\u66f4\u6539\n$ git add .  # \u5f53\u524d\u76ee\u5f55\u4e0b\u7684\u6240\u6709\u66f4\u6539\n$ git add xx\/xx.py xx\/xx2.py  # \u6dfb\u52a0\u67d0\u51e0\u4e2a\u6587\u4ef6<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u7b2c\u4e09\u6b65: git commit\uff0c\u53d8\u4e3a\u5df2\u63d0\u4ea4\u72b6\u6001<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git commit -m\"&lt;\u8fd9\u91cc\u5199commit\u7684\u63cf\u8ff0&gt;\"<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u7b2c\u56db\u6b65: git push\uff0c\u53d8\u4e3a\u5df2\u63a8\u9001\u72b6\u6001<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git push -u origin master # \u7b2c\u4e00\u6b21\u9700\u8981\u5173\u8054\u4e0a\n$ git push # \u4e4b\u540e\u518d\u63a8\u9001\u5c31\u4e0d\u7528\u6307\u660e\u5e94\u8be5\u63a8\u9001\u7684\u8fdc\u7a0b\u5206\u652f\u4e86\n$ git branch # \u53ef\u4ee5\u67e5\u770b\u672c\u5730\u4ed3\u5e93\u7684\u5206\u652f\n$ git branch -a # \u53ef\u4ee5\u67e5\u770b\u672c\u5730\u4ed3\u5e93\u548c\u672c\u5730\u8fdc\u7a0b\u4ed3\u5e93(\u8fdc\u7a0b\u4ed3\u5e93\u7684\u672c\u5730\u955c\u50cf)\u7684\u6240\u6709\u5206\u652f<\/pre>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p>\u5728\u67d0\u4e2a\u5206\u652f\u4e0b\uff0c\u6211\u6700\u5e38\u7528\u7684\u64cd\u4f5c\u5982\u4e0b<\/p>\n<\/blockquote>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git status\n$ git add -a\n$ git status\n$ git commit -m 'xxx'\n$ git pull --rebase\n$ git push origin xxbranch` <\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-5-12\">\u4ee3\u7801\u64a4\u9500\u548c\u64a4\u9500\u540c\u6b65<\/h3>\n\n\n\n<h5 class=\"wp-block-heading\">\u4e00\u3001\u5df2\u4fee\u6539\uff0c\u4f46\u672a\u6682\u5b58<\/h5>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git diff # \u5217\u51fa\u6240\u6709\u7684\u4fee\u6539\n$ git diff xx\/xx.py xx\/xx2.py # \u5217\u51fa\u67d0(\u51e0)\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\n\n$ git checkout # \u64a4\u9500\u9879\u76ee\u4e0b\u6240\u6709\u7684\u4fee\u6539\n$ git checkout . # \u64a4\u9500\u5f53\u524d\u6587\u4ef6\u5939\u4e0b\u6240\u6709\u7684\u4fee\u6539\n$ git checkout xx\/xx.py xx\/xx2.py # \u64a4\u9500\u67d0\u51e0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\n$ git clean -f # untracked\u72b6\u6001\uff0c\u64a4\u9500\u65b0\u589e\u7684\u6587\u4ef6\n$ git clean -df # untracked\u72b6\u6001\uff0c\u64a4\u9500\u65b0\u589e\u7684\u6587\u4ef6\u548c\u6587\u4ef6\u5939\n\n# Untracked files:\n#  (use \"git add &lt;file&gt;...\" to include in what will be committed)\n#\n#    xxx.py<\/pre>\n\n\n\n<h5 class=\"wp-block-heading\">\u4e8c\u3001\u5df2\u6682\u5b58\uff0c\u672a\u63d0\u4ea4<\/h5>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p>\u8fd9\u4e2a\u65f6\u5019\u5df2\u7ecf\u6267\u884c\u8fc7git add\uff0c\u4f46\u672a\u6267\u884cgit commit\uff0c\u4f46\u662f\u7528git diff\u5df2\u7ecf\u770b\u4e0d\u5230\u4efb\u4f55\u4fee\u6539\u3002 \u56e0\u4e3agit diff\u68c0\u67e5\u7684\u662f\u5de5\u4f5c\u533a\u4e0e\u6682\u5b58\u533a\u4e4b\u95f4\u7684\u5dee\u5f02\u3002<\/p>\n<\/blockquote>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git diff --cached # \u8fd9\u4e2a\u547d\u4ee4\u663e\u793a\u6682\u5b58\u533a\u548c\u672c\u5730\u4ed3\u5e93\u7684\u5dee\u5f02\n\n$ git reset # \u6682\u5b58\u533a\u7684\u4fee\u6539\u6062\u590d\u5230\u5de5\u4f5c\u533a\n$ git reset --soft # \u4e0egit reset\u7b49\u4ef7\uff0c\u56de\u5230\u5df2\u4fee\u6539\u72b6\u6001\uff0c\u4fee\u6539\u7684\u5185\u5bb9\u4ecd\u7136\u5728\u5de5\u4f5c\u533a\u4e2d\n$ git reset --hard # \u56de\u5230\u672a\u4fee\u6539\u72b6\u6001\uff0c\u6e05\u7a7a\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a<\/pre>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p>git reset &#8211;hard \u64cd\u4f5c\u7b49\u4ef7\u4e8e git reset \u548c git checkout 2\u6b65\u64cd\u4f5c<\/p>\n<\/blockquote>\n\n\n\n<h5 class=\"wp-block-heading\">\u4e09\u3001\u5df2\u63d0\u4ea4\uff0c\u672a\u63a8\u9001<\/h5>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p>\u6267\u884c\u5b8ccommit\u4e4b\u540e\uff0c\u4f1a\u5728\u4ed3\u5e93\u4e2d\u751f\u6210\u4e00\u4e2a\u7248\u672c\u53f7(hash\u503c)\uff0c\u6807\u5fd7\u8fd9\u6b21\u63d0\u4ea4\u3002\u4e4b\u540e\u4efb\u4f55\u65f6\u5019\uff0c\u90fd\u53ef\u4ee5\u501f\u52a9\u8fd9\u4e2ahash\u503c\u56de\u9000\u5230\u8fd9\u6b21\u63d0\u4ea4\u3002<\/p>\n<\/blockquote>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git diff &lt;branch-name1&gt; &lt;branch-name2&gt; # \u6bd4\u8f832\u4e2a\u5206\u652f\u4e4b\u95f4\u7684\u5dee\u5f02\n$ git diff master origin\/master # \u67e5\u770b\u672c\u5730\u4ed3\u5e93\u4e0e\u672c\u5730\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5dee\u5f02\n\n$ git reset --hard origin\/master # \u56de\u9000\u4e0e\u672c\u5730\u8fdc\u7a0b\u4ed3\u5e93\u4e00\u81f4\n$ git reset --hard HEAD^ # \u56de\u9000\u5230\u672c\u5730\u4ed3\u5e93\u4e0a\u4e00\u4e2a\u7248\u672c\n$ git reset --hard &lt;hash code&gt; # \u56de\u9000\u5230\u4efb\u610f\u7248\u672c\n$ git reset --soft\/git reset # \u56de\u9000\u4e14\u56de\u5230\u5df2\u4fee\u6539\u72b6\u6001\uff0c\u4fee\u6539\u4ecd\u4fdd\u7559\u5728\u5de5\u4f5c\u533a\u4e2d\u3002 <\/pre>\n\n\n\n<h5 class=\"wp-block-heading\">\u56db\u3001\u5df2\u63a8\u9001\u5230\u8fdc\u7a0b<\/h5>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git push -f orgin master # \u5f3a\u5236\u8986\u76d6\u8fdc\u7a0b\u5206\u652f\n$ git push -f # \u5982\u679c\u4e4b\u524d\u5df2\u7ecf\u7528 -u \u5173\u8054\u8fc7\uff0c\u5219\u53ef\u7701\u7565\u5206\u652f\u540d<\/pre>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p>\u614e\u7528\uff0c\u4e00\u822c\u60c5\u51b5\u4e0b\uff0c\u672c\u5730\u5206\u652f\u6bd4\u8fdc\u7a0b\u8981\u65b0\uff0c\u6240\u4ee5\u53ef\u4ee5\u76f4\u63a5\u63a8\u9001\u5230\u8fdc\u7a0b\uff0c\u4f46\u6709\u65f6\u63a8\u9001\u5230\u8fdc\u7a0b\u540e\u53d1\u73b0\u6709\u95ee\u9898\uff0c\u8fdb\u884c\u4e86\u7248\u672c\u56de\u9000\uff0c\u65e7\u7248\u672c\u6216\u8005\u5206\u53c9\u7248\u672c\u63a8\u9001\u5230\u8fdc\u7a0b\uff0c\u9700\u8981\u6dfb\u52a0 -f\u53c2\u6570\uff0c\u8868\u793a\u5f3a\u5236\u8986\u76d6\u3002<\/p>\n<\/blockquote>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"item-5-13\">\u5176\u5b83\u5e38\u89c1\u64cd\u4f5c<\/h3>\n\n\n\n<h4 class=\"wp-block-heading\">\u4e00\u3001\u5173\u8054\u8fdc\u7a0b\u4ed3\u5e93<\/h4>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u8fd8\u6ca1\u6709Git\u4ed3\u5e93\uff0c\u4f60\u9700\u8981<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git init<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u4f60\u60f3\u5173\u8054\u8fdc\u7a0b\u4ed3\u5e93<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git remote add &lt;name&gt; &lt;git-repo-url&gt;\n# \u4f8b\u5982 git remote add origin https:\/\/github.com\/xxxxxx # \u662f\u8fdc\u7a0b\u4ed3\u5e93\u7684\u540d\u79f0\uff0c\u901a\u5e38\u4e3a origin <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u4f60\u60f3\u5173\u8054\u591a\u4e2a\u8fdc\u7a0b\u4ed3\u5e93<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git remote add &lt;name&gt; &lt;another-git-repo-url&gt;\n# \u4f8b\u5982 git remote add coding https:\/\/coding.net\/xxxxxx <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5fd8\u4e86\u5173\u8054\u4e86\u54ea\u4e9b\u4ed3\u5e93\u6216\u8005\u5730\u5740<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git remote -v\n# origin https:\/\/github.com\/gzdaijie\/koa-react-server-render-blog.git (fetch)\n# origin https:\/\/github.com\/gzdaijie\/koa-react-server-render-blog.git (push) <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u8fdc\u7a0b\u6709\u4ed3\u5e93\uff0c\u4f60\u9700\u8981clone\u5230\u672c\u5730<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git clone &lt;git-repo-url&gt;\n# \u5173\u8054\u7684\u8fdc\u7a0b\u4ed3\u5e93\u5c06\u88ab\u547d\u540d\u4e3aorigin\uff0c\u8fd9\u662f\u9ed8\u8ba4\u7684\u3002<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u4f60\u60f3\u628a\u522b\u4eba\u4ed3\u5e93\u7684\u5730\u5740\u6539\u4e3a\u81ea\u5df1\u7684<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git remote set-url origin &lt;your-git-url&gt;<\/pre>\n\n\n\n<h4 class=\"wp-block-heading\">\u4e8c\u3001 \u5207\u6362\u5206\u652f<\/h4>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p>\u65b0\u5efa\u4ed3\u5e93\u540e\uff0c\u9ed8\u8ba4\u751f\u6210\u4e86master\u5206\u652f<\/p>\n<\/blockquote>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u4f60\u60f3\u65b0\u5efa\u5206\u652f\u5e76\u5207\u6362<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git checkout -b &lt;new-branch-name&gt;\n# \u4f8b\u5982 git checkout -b dev\n# \u5982\u679c\u4ec5\u65b0\u5efa\uff0c\u4e0d\u5207\u6362\uff0c\u5219\u53bb\u6389\u53c2\u6570 -b<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u770b\u770b\u5f53\u524d\u6709\u54ea\u4e9b\u5206\u652f<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git branch\n# * dev\n#   master # \u6807*\u53f7\u7684\u4ee3\u8868\u5f53\u524d\u6240\u5728\u7684\u5206\u652f<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u770b\u770b\u5f53\u524d\u672c\u5730&amp;\u8fdc\u7a0b\u6709\u54ea\u4e9b\u5206\u652f<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git branch -a\n# * dev\n#   master\n#   remotes\/origin\/master<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5207\u6362\u5230\u73b0\u6709\u7684\u5206\u652f<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git checkout master<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u4f60\u60f3\u628adev\u5206\u652f\u5408\u5e76\u5230master\u5206\u652f<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git merge &lt;branch-name&gt;\n# \u4f8b\u5982 git merge dev<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u4f60\u60f3\u628a\u672c\u5730master\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u53bb<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git push origin master\n# \u4f60\u53ef\u4ee5\u4f7f\u7528git push -u origin master\u5c06\u672c\u5730\u5206\u652f\u4e0e\u8fdc\u7a0b\u5206\u652f\u5173\u8054\uff0c\u4e4b\u540e\u4ec5\u9700\u8981\u4f7f\u7528git push\u5373\u53ef\u3002<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u8fdc\u7a0b\u5206\u652f\u88ab\u522b\u4eba\u66f4\u65b0\u4e86\uff0c\u4f60\u9700\u8981\u66f4\u65b0\u4ee3\u7801<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git pull origin &lt;branch-name&gt;\n# \u4e4b\u524d\u5982\u679cpush\u65f6\u4f7f\u7528\u8fc7-u\uff0c\u90a3\u4e48\u5c31\u53ef\u4ee5\u7701\u7565\u4e3agit pull<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u672c\u5730\u6709\u4fee\u6539\uff0c\u80fd\u4e0d\u80fd\u5148git pull<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git stash # \u5de5\u4f5c\u533a\u4fee\u6539\u6682\u5b58\n$ git pull  # \u66f4\u65b0\u5206\u652f\n$ git stash pop # \u6682\u5b58\u4fee\u6539\u6062\u590d\u5230\u5de5\u4f5c\u533a  <\/pre>\n\n\n\n<h4 class=\"wp-block-heading\">\u4e09\u3001 \u64a4\u9500\u64cd\u4f5c<\/h4>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u6062\u590d\u6682\u5b58\u533a\u6587\u4ef6\u5230\u5de5\u4f5c\u533a<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git checkout &lt;file-name&gt; <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u6062\u590d\u6682\u5b58\u533a\u7684\u6240\u6709\u6587\u4ef6\u5230\u5de5\u4f5c\u533a<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git checkout .<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u91cd\u7f6e\u6682\u5b58\u533a\u7684\u67d0\u6587\u4ef6\uff0c\u4e0e\u4e0a\u4e00\u6b21commit\u4fdd\u6301\u4e00\u81f4\uff0c\u4f46\u5de5\u4f5c\u533a\u4e0d\u53d8<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git reset &lt;file-name&gt;<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u91cd\u7f6e\u6682\u5b58\u533a\u4e0e\u5de5\u4f5c\u533a\uff0c\u4e0e\u4e0a\u4e00\u6b21commit\u4fdd\u6301\u4e00\u81f4<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git reset --hard &lt;file-name&gt;\n# \u5982\u679c\u662f\u56de\u9000\u7248\u672c(commit)\uff0c\u90a3\u4e48file\uff0c\u53d8\u6210commit\u7684hash\u7801\u5c31\u597d\u4e86\u3002 <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u53bb\u6389\u67d0\u4e2acommit<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git revert &lt;commit-hash&gt;\n# \u5b9e\u8d28\u662f\u65b0\u5efa\u4e86\u4e00\u4e2a\u4e0e\u539f\u6765\u5b8c\u5168\u76f8\u53cd\u7684commit\uff0c\u62b5\u6d88\u4e86\u539f\u6765commit\u7684\u6548\u679c <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>reset\u56de\u9000\u9519\u8bef\u6062\u590d<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git reflog #\u67e5\u770b\u6700\u8fd1\u64cd\u4f5c\u8bb0\u5f55\n$ git reset --hard HEAD{5} #\u6062\u590d\u5230\u524d\u4e94\u7b14\u64cd\u4f5c\n$ git pull origin backend-log #\u518d\u6b21\u62c9\u53d6\u4ee3\u7801<\/pre>\n\n\n\n<h4 class=\"wp-block-heading\">\u56db\u3001\u7248\u672c\u56de\u9000\u4e0e\u524d\u8fdb<\/h4>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u67e5\u770b\u5386\u53f2\u7248\u672c<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git log<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u4f60\u53ef\u80fd\u89c9\u5f97\u8fd9\u6837\u7684log\u4e0d\u597d\u770b\uff0c\u8bd5\u8bd5\u8fd9\u4e2a<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git log --graph --decorate --abbrev-commit --all<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u68c0\u51fa\u5230\u4efb\u610f\u7248\u672c<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git checkout a5d88ea\n# hash\u7801\u5f88\u957f\uff0c\u901a\u5e386-7\u4f4d\u5c31\u591f\u4e86<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u8fdc\u7a0b\u4ed3\u5e93\u7684\u7248\u672c\u5f88\u65b0\uff0c\u4f46\u662f\u4f60\u8fd8\u662f\u60f3\u7528\u8001\u7248\u672c\u8986\u76d6<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git push origin master --force\n# \u6216\u8005 git push -f origin master<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u89c9\u5f97commit\u592a\u591a\u4e86? \u591a\u4e2acommit\u5408\u5e76\u4e3a1\u4e2a<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git rebase -i HEAD~4\n# \u8fd9\u4e2a\u547d\u4ee4\uff0c\u5c06\u6700\u8fd14\u4e2acommit\u5408\u5e76\u4e3a1\u4e2a\uff0cHEAD\u4ee3\u8868\u5f53\u524d\u7248\u672c\u3002\u5c06\u8fdb\u5165VIM\u754c\u9762\uff0c\u4f60\u53ef\u4ee5\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002\u63a8\u9001\u5230\u8fdc\u7a0b\u5206\u652f\u7684commit\uff0c\u4e0d\u5efa\u8bae\u8fd9\u6837\u505a\uff0c\u591a\u4eba\u5408\u4f5c\u65f6\uff0c\u901a\u5e38\u4e0d\u5efa\u8bae\u4fee\u6539\u5386\u53f2\u3002 <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u60f3\u56de\u9000\u5230\u67d0\u4e00\u4e2a\u7248\u672c<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git reset --hard &lt;hash&gt;\n# \u4f8b\u5982 git reset --hard a3hd73r\n# --hard\u4ee3\u8868\u4e22\u5f03\u5de5\u4f5c\u533a\u7684\u4fee\u6539\uff0c\u8ba9\u5de5\u4f5c\u533a\u4e0e\u7248\u672c\u4ee3\u7801\u4e00\u6a21\u4e00\u6837\uff0c\u4e0e\u4e4b\u5bf9\u5e94\uff0c--soft\u53c2\u6570\u4ee3\u8868\u4fdd\u7559\u5de5\u4f5c\u533a\u7684\u4fee\u6539\u3002\n<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u60f3\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\uff0c\u6709\u6ca1\u6709\u7b80\u4fbf\u65b9\u6cd5?<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git reset --hard HEAD^ <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u56de\u9000\u5230\u4e0a\u4e0a\u4e2a\u7248\u672c\u5462?<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git reset --hard HEAD^^\n# HEAD^^\u53ef\u4ee5\u6362\u4f5c\u5177\u4f53\u7248\u672chash\u503c\u3002<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u56de\u9000\u9519\u4e86\uff0c\u80fd\u4e0d\u80fd\u524d\u8fdb\u5440<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git reflog\n# \u8fd9\u4e2a\u547d\u4ee4\u4fdd\u7559\u4e86\u6700\u8fd1\u6267\u884c\u7684\u64cd\u4f5c\u53ca\u6240\u5904\u7684\u7248\u672c\uff0c\u6bcf\u6761\u547d\u4ee4\u524d\u7684hash\u503c\uff0c\u5219\u662f\u5bf9\u5e94\u7248\u672c\u7684hash\u503c\u3002\u4f7f\u7528\u4e0a\u8ff0\u7684git checkout \u6216\u8005 git reset\u547d\u4ee4 \u5219\u53ef\u4ee5\u68c0\u51fa\u6216\u56de\u9000\u5230\u5bf9\u5e94\u7248\u672c\u3002<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u521a\u624dcommit\u4fe1\u606f\u5199\u9519\u4e86\uff0c\u53ef\u4ee5\u4fee\u6539\u5417<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git commit --amend<\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u770b\u770b\u5f53\u524d\u72b6\u6001\u5427<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git status <\/pre>\n\n\n\n<h4 class=\"wp-block-heading\">\u4e94\u3001\u914d\u7f6e\u5c5e\u4e8e\u4f60\u7684Git<\/h4>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u770b\u770b\u5f53\u524d\u7684\u914d\u7f6e<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git config --list <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u4f30\u8ba1\u4f60\u9700\u8981\u914d\u7f6e\u4f60\u7684\u540d\u5b57<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git config --global user.name \"&lt;name&gt;\n#  --global\u4e3a\u53ef\u9009\u53c2\u6570\uff0c\u8be5\u53c2\u6570\u8868\u793a\u914d\u7f6e\u5168\u5c40\u4fe1\u606f` <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5e0c\u671b\u522b\u4eba\u770b\u5230\u4f60\u7684commit\u53ef\u4ee5\u8054\u7cfb\u5230\u4f60<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git config --global user.email \"&lt;email address&gt;\" <\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u6709\u4e9b\u547d\u4ee4\u5f88\u957f\uff0c\u80fd\u4e0d\u80fd\u7b80\u5316\u4e00\u4e0b<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-preformatted\">$ git config --global alias.logg \"log --graph --decorate --abbrev-commit --all\"\n# \u4e4b\u540e\u5c31\u53ef\u4ee5\u5f00\u5fc3\u5730\u4f7f\u7528 git log\u4e86<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u6982\u5ff5\uff1a Git\u662f\u4e00\u4e2a\u7248\u672c\u7ba1\u7406\u63a7\u5236\u7cfb\u7edf\uff08\u7f29\u5199VCS\uff09\uff0c\u5b83\u53ef\u4ee5\u5728\u4efb\u4f55\u65f6\u95f4\u70b9\uff0c\u5c06\u6587\u6863\u7684\u72b6\u6001\u4f5c\u4e3a\u66f4\u65b0\u8bb0\u5f55\u4fdd\u5b58\u8d77\u6765\uff0c\u4e5f\u53ef [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[9,14],"tags":[21],"class_list":["post-899","post","type-post","status-publish","format-standard","hentry","category-9","category-14","tag-gitee"],"_links":{"self":[{"href":"https:\/\/www.chencuo.top\/index.php?rest_route=\/wp\/v2\/posts\/899","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.chencuo.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.chencuo.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.chencuo.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.chencuo.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=899"}],"version-history":[{"count":0,"href":"https:\/\/www.chencuo.top\/index.php?rest_route=\/wp\/v2\/posts\/899\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.chencuo.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=899"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.chencuo.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=899"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.chencuo.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=899"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}