{"id":175,"date":"2026-05-01T10:46:00","date_gmt":"2026-05-01T02:46:00","guid":{"rendered":"https:\/\/larkdrop.cafe\/?p=175"},"modified":"2026-04-30T20:47:03","modified_gmt":"2026-04-30T12:47:03","slug":"git","status":"publish","type":"post","link":"https:\/\/larkdrop.cafe\/index.php\/2026\/05\/01\/git\/","title":{"rendered":"Git"},"content":{"rendered":"\n<h2 class=\"wp-block-heading\">Git\u4ecb\u7ecd<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">Git \u662f\u7531 Linus Torvalds\uff08Linux\u4e4b\u7236\uff09\u5f00\u53d1\u7684\u7b2c\u4e8c\u4e2a\u4f1f\u5927\u4f5c\u54c1\u30022005\u5e74\uff0c\u7531\u4e8eBitKeeper\u8f6f\u4ef6\u516c\u53f8\u5bf9Linux\u793e\u533a\u505c\u6b62\u4e86\u514d\u8d39\u4f7f\u7528\u6743\uff0cLinus\u8feb\u4e0d\u5f97\u5df2\u81ea\u5df1\u5f00\u53d1\u4e86\u4e00\u4e2a\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u5de5\u5177\u3002\u636e\u8bf4Linus\u82b1\u4e86<strong>\u4e24\u5468\u65f6\u95f4<\/strong>\u7528C\u8bed\u8a00\u5199\u4e86\u4e00\u4e2a\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u8fd9\u5c31\u662fGit\u3002\u4e00\u4e2a\u6708\u4e4b\u5185\uff0cLinux\u7cfb\u7edf\u7684\u6e90\u7801\u5df2\u7ecf\u7531Git\u7ba1\u7406\u4e86\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"1-2-\u4ec0\u4e48\u662fgit\">\u4ec0\u4e48\u662fGit<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">Git \u662f\u4e00\u4e2a<strong>\u7248\u672c\u63a7\u5236\u5de5\u5177<\/strong>\uff0c\u53ef\u4ee5<strong>\u8bb0\u5f55\u548c\u8ffd\u8e2a<\/strong>\u67d0\u4e2a\u6587\u4ef6\u5728\u67d0\u4e00\u4e2a\u65f6\u523b\u7684\u5185\u5bb9\u548c\u72b6\u6001\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u7684\u4f7f\u7528\u6709\u70b9\u50cf\u4e00\u4e2a&#8221;\u7f51\u76d8&#8221;\uff0c\u4f46\u8fd9\u4e2a\u7f51\u76d8\u6bd4\u7f51\u76d8\u66f4\u9ad8\u7ea7\u2014\u2014Git\u53ef\u4ee5\u8ffd\u8e2a&#8221;\u7f51\u76d8&#8221;\u4e2d\u6587\u4ef6\u7684<strong>\u5386\u53f2\u7248\u672c\u72b6\u6001<\/strong>\u3002<\/p>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\">\ud83d\udd11&nbsp;<strong>\u6838\u5fc3\u7406\u89e3<\/strong>\uff1aGit \u53ef\u4ee5\u8bb0\u5f55\u67d0\u4e2a\u6587\u4ef6\u5939\u4e0b\u7684\u4e0d\u540c\u6587\u4ef6\u5728\u4e0d\u540c\u65f6\u95f4\u8282\u70b9\u7684\u4e0d\u540c\u72b6\u6001\uff0c\u5e76\u8ffd\u8e2a\u8fd9\u4e9b\u6587\u4ef6\u4ea7\u751f\u7684\u53d8\u5316\u3002<\/p>\n<\/blockquote>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"1-3-git\u7684\u7279\u70b9\">Git\u7684\u7279\u70b9<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th class=\"has-text-align-left\" data-align=\"left\">\u7279\u70b9<\/th><th class=\"has-text-align-left\" data-align=\"left\">\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u5206\u5e03\u5f0f<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u6bcf\u4e2a\u5f00\u53d1\u8005\u672c\u5730\u90fd\u6709\u5b8c\u6574\u7684\u4ed3\u5e93\u526f\u672c<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u79bb\u7ebf\u53ef\u7528<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u5927\u90e8\u5206\u64cd\u4f5c\u53ef\u4ee5\u5728\u672c\u5730\u5b8c\u6210\uff0c\u65e0\u9700\u8054\u7f51<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u53ef\u56de\u9000<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u53ef\u4ee5\u968f\u65f6\u56de\u6eda\u5230\u4efb\u610f\u5386\u53f2\u7248\u672c<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"1-4-git-vs-svn-\u5bf9\u6bd4\">Git vs SVN \u5bf9\u6bd4<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th class=\"has-text-align-left\" data-align=\"left\">\u5bf9\u6bd4\u9879<\/th><th class=\"has-text-align-left\" data-align=\"left\">SVN\uff08\u96c6\u4e2d\u5f0f\uff09<\/th><th class=\"has-text-align-left\" data-align=\"left\">Git\uff08\u5206\u5e03\u5f0f\uff09<\/th><\/tr><\/thead><tbody><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u67b6\u6784<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u4e2d\u592e\u670d\u52a1\u5668 + \u5ba2\u6237\u7aef<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u6bcf\u4e2a\u8282\u70b9\u90fd\u662f\u5b8c\u6574\u4ed3\u5e93<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u7f51\u7edc\u4f9d\u8d56<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u63d0\u4ea4\u3001\u66f4\u65b0\u90fd\u9700\u8981\u8054\u7f51<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u672c\u5730\u64cd\u4f5c\u65e0\u9700\u8054\u7f51<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u6570\u636e\u5b89\u5168<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u4e2d\u592e\u670d\u52a1\u5668\u6302\u6389\u6709\u98ce\u9669<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u6bcf\u4e2a\u8282\u70b9\u90fd\u6709\u5b8c\u6574\u5907\u4efd<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u5206\u652f\u64cd\u4f5c<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u5206\u652f\u662f\u76ee\u5f55\u7684\u62f7\u8d1d\uff0c\u8f83\u91cd<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u8f7b\u91cf\u7ea7\u5206\u652f\uff0c\u5feb\u901f\u5207\u6362<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526111136071.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526111136071.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u96c6\u4e2d\u5f0fvs\u5206\u5e03\u5f0f\"\/><\/div><\/figure>\n\n\n\n<h2 class=\"wp-block-heading\">Git\u6838\u5fc3\u6d41\u7a0b<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"3-1-git\u5de5\u4f5c\u533a\u57df\">Git\u5de5\u4f5c\u533a\u57df<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u7ba1\u7406\u6587\u4ef6\u6709<strong>\u4e09\u4e2a\u6838\u5fc3\u533a\u57df<\/strong>\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u5de5\u4f5c\u533a<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u7f16\u5199\u3001\u4fee\u6539\u3001\u5220\u9664\u6587\u4ef6\u53d1\u751f\u5728\u8fd9\u91cc\u3002<code>Working Directory<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u6682\u5b58\u533a<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u628a\u8fd9\u6b21\u51c6\u5907\u63d0\u4ea4\u7684\u6539\u52a8\u5148\u6536\u62e2\u8d77\u6765\u3002<code>Staging Area \/ Index<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u672c\u5730\u4ed3\u5e93<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u751f\u6210\u53ef\u8ffd\u6eaf\u7684\u7248\u672c\u5386\u53f2\uff0c\u7559\u5728\u672c\u673a\u4ed3\u5e93\u4e2d\u3002<code>Local Repository<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u8fdc\u7a0b\u4ed3\u5e93<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u628a\u672c\u5730\u7248\u672c\u540c\u6b65\u7ed9\u56e2\u961f\u6210\u5458\u548c\u4ee3\u7801\u5e73\u53f0\u3002<code>Remote Repository<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u533a\u57df\u8be6\u89e3<\/strong>\uff1a<\/p>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th class=\"has-text-align-left\" data-align=\"left\">\u533a\u57df<\/th><th class=\"has-text-align-left\" data-align=\"left\">\u82f1\u6587<\/th><th class=\"has-text-align-left\" data-align=\"left\">\u8bf4\u660e<\/th><\/tr><\/thead><tbody><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u5de5\u4f5c\u533a<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">Working Directory<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u4f60\u7535\u8111\u4e0a\u5b9e\u9645\u770b\u5230\u7684\u6587\u4ef6\u76ee\u5f55<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u6682\u5b58\u533a<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">Staging Area \/ Index<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u4e34\u65f6\u5b58\u653e\u4fee\u6539\u7684\u5730\u65b9\uff0c<code>.git\/index<\/code><\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u672c\u5730\u4ed3\u5e93<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">Local Repository<\/td><td class=\"has-text-align-left\" data-align=\"left\">Git\u5b58\u50a8\u7248\u672c\u6570\u636e\u7684\u5730\u65b9\uff0c<code>.git\/<\/code>\u76ee\u5f55<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><strong>\u8fdc\u7a0b\u4ed3\u5e93<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">Remote Repository<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u5982GitHub\u3001Gitee\u7b49\u670d\u52a1\u5668\u4e0a\u7684\u4ed3\u5e93<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526113143360.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526113143360.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"Git\u6838\u5fc3\u6d41\u7a0b\"\/><\/div><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"3-2-\u6587\u4ef6\u72b6\u6001\u6d41\u8f6c\">\u6587\u4ef6\u72b6\u6001\u6d41\u8f6c<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>\u672a\u8ffd\u8e2a(Untracked) \u2500\u2500\u2500\u2500\u2500\u2500\u25ba \u5df2\u6682\u5b58(Staged) \u2500\u2500\u2500\u2500\u2500\u2500\u25ba \u5df2\u63d0\u4ea4(Committed)<br>\u25b2 \u2502<br>\u2502 \u2502<br>\u2514\u2500\u2500\u2500\u2500 \u4fee\u6539\u540e\u91cd\u65b0add \u25c4\u2500\u2500\u2518<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image size-large\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/larkdrop.cafe\/wp-content\/uploads\/2026\/04\/image-37-1024x765.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"765\" data-original=\"https:\/\/larkdrop.cafe\/wp-content\/uploads\/2026\/04\/image-37-1024x765.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" class=\"wp-image-176\"  sizes=\"auto, (max-width: 1024px) 100vw, 1024px\" \/><\/div><\/figure>\n\n\n\n<h2 class=\"wp-block-heading\">Git\u57fa\u7840\u547d\u4ee4<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-1-\u6ce8\u518c\u8fdc\u7a0b\u4ed3\u5e93\u5e73\u53f0\">\u6ce8\u518c\u8fdc\u7a0b\u4ed3\u5e93\u5e73\u53f0<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u4ee5Gitee\uff08\u7801\u4e91\uff09\u4e3a\u4f8b\uff0c\u56fd\u5185\u8bbf\u95ee\u901f\u5ea6\u5feb\uff1a<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u8bbf\u95ee\u00a0<a href=\"https:\/\/gitee.com\/\">https:\/\/gitee.com<\/a>\u00a0\u6ce8\u518c\u8d26\u53f7<\/li>\n\n\n\n<li>\u6ce8\u518c\u65f6\u8bf7\u8bb0\u4f4f\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u7528\u6237\u540d\uff08\u63a8\u8350\u4f7f\u7528\u82f1\u6587\uff09<\/li>\n\n\n\n<li>\u5bc6\u7801<\/li>\n\n\n\n<li>\u624b\u673a\u53f7<\/li>\n\n\n\n<li>\u90ae\u7bb1\uff08\u53ef\u4ee5\u6ce8\u518c\u540e\u81ea\u884c\u8bbe\u7f6e\uff09<\/li>\n<\/ul>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\">\u26a0\ufe0f&nbsp;<strong>\u91cd\u8981<\/strong>\uff1a\u5bc6\u7801\u4e00\u5b9a\u8981\u7262\u8bb0\uff0c\u540e\u7eedpush\u4ee3\u7801\u65f6\u9700\u8981\u9a8c\u8bc1\u3002<\/p>\n<\/blockquote>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-2-\u521b\u5efa\u8fdc\u7a0b\u4ed3\u5e93\">\u521b\u5efa\u8fdc\u7a0b\u4ed3\u5e93<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u767b\u5f55Gitee\u540e\uff0c\u70b9\u51fb\u53f3\u4e0a\u89d2&#8221;+&#8221;\u53f7\u521b\u5efa\u4ed3\u5e93\uff1a<\/p>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526114956920.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526114956920.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u521b\u5efa\u4ed3\u5e93\"\/><\/div><figcaption class=\"wp-element-caption\">\u521b\u5efa\u4ed3\u5e93<\/figcaption><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\">\u521b\u5efa\u65f6\u5efa\u8bae\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u4ed3\u5e93\u540d\u79f0\u4f7f\u7528\u82f1\u6587<\/li>\n\n\n\n<li>\u9009\u62e9\u516c\u5f00\u6216\u79c1\u6709\uff08\u521d\u5b66\u8005\u5efa\u8bae\u516c\u5f00\uff09<\/li>\n\n\n\n<li><strong>\u52fe\u9009&#8221;\u521d\u59cb\u5316\u4ed3\u5e93&#8221;\u548c&#8221;\u6dfb\u52a0README.md&#8221;<\/strong><\/li>\n\n\n\n<li><strong>\u52fe\u9009&#8221;\u6dfb\u52a0.gitignore&#8221;<\/strong>\uff08Java\u9879\u76ee\u9009Java\u6a21\u677f\uff09<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-3-git-clone---\u514b\u9686\u4ed3\u5e93\">git clone &#8211; \u514b\u9686\u4ed3\u5e93<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u4e0b\u8f7d\u5230\u672c\u5730\uff08<strong>\u9996\u6b21\u4f7f\u7528\u5fc5\u987b\u64cd\u4f5c<\/strong>\uff09\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u65b9\u5f0f1\uff1a\u4e0b\u8f7d\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u672c\u5730\u521b\u5efa\u540c\u540d\u6587\u4ef6\u5939\ngit clone https:\/\/gitee.com\/common-zhou\/test_50th.git\n\n# \u65b9\u5f0f2\uff1a\u6307\u5b9a\u672c\u5730\u6587\u4ef6\u5939\u540d\u79f0\ngit clone https:\/\/gitee.com\/common-zhou\/test_53th.git test_53th_local\n\n# \u65b9\u5f0f3\uff1a\u514b\u9686\u5230\u5f53\u524d\u76ee\u5f55\u7684\u6307\u5b9a\u6587\u4ef6\u5939\uff08\u6587\u4ef6\u5939\u5fc5\u987b\u4e3a\u7a7a\u6216\u4e0d\u5b58\u5728\uff09\ngit clone https:\/\/gitee.com\/ciggar\/test-40th.git dirName<\/code><\/pre>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\">\ud83d\udca1&nbsp;<strong>\u63d0\u793a<\/strong>\uff1a\u514b\u9686\u540e\u4f1a\u81ea\u52a8\u521b\u5efa<code>.git<\/code>\u6587\u4ef6\u5939\uff08Git\u5143\u4fe1\u606f\u76ee\u5f55\uff09\uff0c<strong>\u4e0d\u8981\u624b\u52a8\u4fee\u6539\u6216\u5220\u9664<\/strong>\uff01<\/p>\n<\/blockquote>\n\n\n\n<h4 class=\"wp-block-heading\">\u26a0\ufe0f \u6587\u4ef6\u7c7b\u578b\u6ce8\u610f\u4e8b\u9879<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u7ba1\u7406\u6587\u4ef6\u7248\u672c\uff0c<strong>\u63a8\u8350\u4f7f\u7528\u6587\u672c\u6587\u4ef6<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u2705\u00a0<code>.txt<\/code>\u3001<code>.md<\/code>\u3001<code>.java<\/code>\u3001<code>.xml<\/code>\u00a0\u7b49<\/li>\n\n\n\n<li>\u274c \u907f\u514d\u4f7f\u7528\u00a0<code>.docx<\/code>\u3001<code>.pptx<\/code>\u3001<code>.xlsx<\/code>\u00a0\u7b49\u4e8c\u8fdb\u5236\u683c\u5f0f<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u5bf9\u6bd4\u6587\u4ef6\u53d8\u5316\u662f\u4e00\u884c\u4e00\u884c\u6bd4\u8f83\u7684\uff0c<code>.docx<\/code>\u7b49\u662f\u538b\u7f29\u5305\u683c\u5f0f\uff0c\u65e0\u6cd5\u6709\u6548\u5bf9\u6bd4\u5dee\u5f02\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-4-git-status---\u67e5\u770b\u72b6\u6001\">git status &#8211; \u67e5\u770b\u72b6\u6001<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u67e5\u770b\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u53d8\u5316\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git status<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u8f93\u51fa\u8bf4\u660e\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\ud83d\udd34\u00a0<strong>\u7ea2\u8272<\/strong>\uff1a\u5de5\u4f5c\u533a\u6709\u53d8\u5316\uff08\u672a\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff09<\/li>\n\n\n\n<li>\ud83d\udfe2\u00a0<strong>\u7eff\u8272<\/strong>\uff1a\u6682\u5b58\u533a\u6709\u53d8\u5316\uff08\u5df2add\u672acommit\uff09<\/li>\n<\/ul>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526144014440.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526144014440.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"status\u793a\u4f8b\"\/><\/div><figcaption class=\"wp-element-caption\">status\u793a\u4f8b<\/figcaption><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u7b80\u5316\u8f93\u51fa<\/strong>\uff08\u63a8\u8350\u65e5\u5e38\u4f7f\u7528\uff09\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git status -s\n# \u6216\ngit status --short<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-5-git-add---\u6dfb\u52a0\u5230\u6682\u5b58\u533a\">git add &#8211; \u6dfb\u52a0\u5230\u6682\u5b58\u533a<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5c06\u5de5\u4f5c\u533a\u7684\u53d8\u5316\u63d0\u4ea4\u5230\u6682\u5b58\u533a\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u65b9\u5f0f1\uff1a\u6dfb\u52a0\u6307\u5b9a\u6587\u4ef6\ngit add filename.txt\ngit add src\/Main.java\n\n# \u65b9\u5f0f2\uff1a\u901a\u914d\u7b26\u6dfb\u52a0\ngit add *.java          # \u6240\u6709.java\u6587\u4ef6\ngit add src\/*           # src\u76ee\u5f55\u4e0b\u6240\u6709\u6587\u4ef6\ngit add src\/**\/*.java   # src\u53ca\u5176\u5b50\u76ee\u5f55\u4e0b\u6240\u6709.java\u6587\u4ef6\n\n# \u65b9\u5f0f3\uff1a\u6dfb\u52a0\u6240\u6709\u53d8\u5316\uff08\u6700\u5e38\u7528\uff09\ngit add .\n\n# \u65b9\u5f0f4\uff1a\u4ea4\u4e92\u5f0f\u6dfb\u52a0\uff08\u9009\u62e9\u6027\u6dfb\u52a0\uff09\ngit add -i<\/code><\/pre>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\"><strong>\u5b9e\u6218\u5efa\u8bae<\/strong>\uff1a\u65e5\u5e38\u5f00\u53d1\u4e2d\uff0c<code>git add .<\/code>\u00a0\u6700\u5e38\u7528\uff0c\u4f46\u8981\u6ce8\u610f<code>.gitignore<\/code>\u7684\u914d\u7f6e\u3002<\/p>\n<\/blockquote>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-6-git-commit---\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\">git commit &#8211; \u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5c06\u6682\u5b58\u533a\u7684\u5185\u5bb9\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u751f\u6210\u4e00\u4e2a\u7248\u672c\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u57fa\u7840\u63d0\u4ea4\ngit commit -m \"\u63d0\u4ea4\u4fe1\u606f\"\n\n# \u6dfb\u52a0\u5e76\u63d0\u4ea4\uff08\u8df3\u8fc7git add\uff09\ngit commit -am \"\u63d0\u4ea4\u4fe1\u606f\"\n\n# \u4fee\u6539\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\uff08\u672apush\u524d\uff09\ngit commit --amend -m \"\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\"<\/code><\/pre>\n\n\n\n<h4 class=\"wp-block-heading\">\u9996\u6b21\u63d0\u4ea4\u914d\u7f6e<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u7b2c\u4e00\u6b21commit\u524d\uff0c\u5fc5\u987b\u8bbe\u7f6e\u7528\u6237\u540d\u548c\u90ae\u7bb1<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u65b9\u5f0f1\uff1a\u547d\u4ee4\u884c\u8bbe\u7f6e\uff08\u63a8\u8350\uff09\ngit config --global user.name \"Your Name\"\ngit config --global user.email \"your.email@example.com\"\n\n# \u65b9\u5f0f2\uff1a\u76f4\u63a5\u7f16\u8f91\u914d\u7f6e\u6587\u4ef6\n# Windows: C:\\Users\\\u7528\u6237\u540d\\.gitconfig\n# Linux\/Mac: ~\/.gitconfig<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u914d\u7f6e\u6587\u4ef6\u5185\u5bb9\u793a\u4f8b\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&#91;user]\n    name = stone\n    email = shitou@cskaoyan.com<\/code><\/pre>\n\n\n\n<h4 class=\"wp-block-heading\">\u63d0\u4ea4\u4fe1\u606f\u89c4\u8303<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\">\u826f\u597d\u7684\u63d0\u4ea4\u4fe1\u606f\u5e94\u8be5\u4e00\u76ee\u4e86\u7136\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u63a8\u8350\u683c\u5f0f\ngit commit -m \"\u529f\u80fd\u63cf\u8ff0 (issue\u7f16\u53f7)\"\n\n# \u793a\u4f8b\ngit commit -m \"\u4fee\u590d\u7528\u6237\u767b\u5f55bug (#123)\"\ngit commit -m \"\u6dfb\u52a0HashMap\u7ec3\u4e60\u4ee3\u7801\"\ngit commit -m \"\u4f18\u5316\u6570\u636e\u5e93\u67e5\u8be2\u6027\u80fd\"\n\n# \u274c \u4e0d\u597d\u7684\u793a\u4f8b\ngit commit -m \"1\"\ngit commit -m \"abc\"\ngit commit -m \"\u4fee\u6539\"<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u63d0\u4ea4\u4fe1\u606f\u6a21\u677f<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;type&gt;(&lt;scope&gt;): &lt;subject&gt;\n\n&lt;body&gt;\n\n&lt;footer&gt;<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u5e38\u7528type\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><code>feat<\/code>\uff1a\u65b0\u529f\u80fd<\/li>\n\n\n\n<li><code>fix<\/code>\uff1a\u4fee\u590dbug<\/li>\n\n\n\n<li><code>docs<\/code>\uff1a\u6587\u6863\u4fee\u6539<\/li>\n\n\n\n<li><code>style<\/code>\uff1a\u683c\u5f0f\u4fee\u6539\uff08\u4e0d\u5f71\u54cd\u4ee3\u7801\u903b\u8f91\uff09<\/li>\n\n\n\n<li><code>refactor<\/code>\uff1a\u91cd\u6784<\/li>\n\n\n\n<li><code>test<\/code>\uff1a\u6d4b\u8bd5\u76f8\u5173<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-7-git-push---\u63a8\u9001\u5230\u8fdc\u7a0b\">git push &#8211; \u63a8\u9001\u5230\u8fdc\u7a0b<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5c06\u672c\u5730\u4ed3\u5e93\u7684\u6240\u6709\u53d8\u5316\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u63a8\u9001\u5230\u9ed8\u8ba4\u8fdc\u7a0b\u5206\u652f\ngit push\n\n# \u63a8\u9001\u5230\u6307\u5b9a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6307\u5b9a\u5206\u652f\ngit push origin main\ngit push origin master\n\n# \u9996\u6b21\u63a8\u9001\u5e76\u5efa\u7acb\u8ffd\u8e2a\u5173\u7cfb\ngit push -u origin main<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20230111111257900.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20230111111257900.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"push\u793a\u4f8b\"\/><\/div><figcaption class=\"wp-element-caption\">push\u793a\u4f8b<\/figcaption><\/figure>\n\n\n\n<h4 class=\"wp-block-heading\">push\u91cd\u8981\u8bf4\u660e<\/h4>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u7b2c\u4e00\u6b21push\u9700\u8981\u9a8c\u8bc1\u8eab\u4efd<\/strong>\uff1a\u8f93\u5165\u7528\u6237\u540d\u548c\u5bc6\u7801\uff08\u6216Token\uff09<\/li>\n<\/ol>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526150144318.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526150144318.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u8eab\u4efd\u9a8c\u8bc1\"\/><\/div><figcaption class=\"wp-element-caption\">\u8eab\u4efd\u9a8c\u8bc1<\/figcaption><\/figure>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>push\u4e0d\u80fd\u6307\u5b9a\u5355\u4e2a\u6587\u4ef6<\/strong>\uff0c\u53ea\u80fd\u63a8\u9001\u6574\u4e2a\u5206\u652f<\/li>\n\n\n\n<li><strong>push\u7684\u524d\u63d0<\/strong>\uff1a\u672c\u5730\u4ed3\u5e93\u7248\u672c\u5fc5\u987b\u9886\u5148\u4e8e\u8fdc\u7a0b\u4ed3\u5e93\uff08\u6216\u5df2\u5408\u5e76\u8fdc\u7a0b\u66f4\u65b0\uff09<\/li>\n<\/ol>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-8-git-pull---\u62c9\u53d6\u66f4\u65b0\">git pull &#8211; \u62c9\u53d6\u66f4\u65b0<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6700\u65b0\u53d8\u5316\u62c9\u53d6\u5230\u672c\u5730\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git pull<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526151312030.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526151312030.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"pull\u793a\u4f8b\"\/><\/div><figcaption class=\"wp-element-caption\">pull\u793a\u4f8b<\/figcaption><\/figure>\n\n\n\n<h4 class=\"wp-block-heading\">pull\u7684\u672c\u8d28<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\"><code>git pull<\/code>&nbsp;=&nbsp;<code>git fetch<\/code>&nbsp;+&nbsp;<code>git merge<\/code><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u7b49\u4ef7\u4e8e\ngit fetch origin        # \u4e0b\u8f7d\u8fdc\u7a0b\u66f4\u65b0\ngit merge origin\/main   # \u5408\u5e76\u5230\u5f53\u524d\u5206\u652f<\/code><\/pre>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\"><strong>\u9ec4\u91d1\u6cd5\u5219<\/strong>\uff1a&#8221;\u843d\u540e\u5c31\u8981pull&#8221;\u2014\u2014\u5f53\u672c\u5730\u7248\u672c\u843d\u540e\u4e8e\u8fdc\u7a0b\u65f6\uff0c\u5fc5\u987b\u5148pull\u624d\u80fdpush\u3002<\/p>\n<\/blockquote>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"4-9-git-log---\u67e5\u770b\u5386\u53f2\">git log &#8211; \u67e5\u770b\u5386\u53f2<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u67e5\u770b\u4ed3\u5e93\u7684\u7248\u672c\u5386\u53f2\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u57fa\u7840\u67e5\u770b\ngit log\n\n# \u7b80\u5316\u8f93\u51fa\uff08\u63a8\u8350\uff09\ngit log --oneline\n\n# \u56fe\u5f62\u5316\u663e\u793a\u5206\u652f\ngit log --oneline --graph --all\n\n# \u67e5\u770b\u6700\u8fd1n\u6761\ngit log -5\n\n# \u67e5\u770b\u6307\u5b9a\u6587\u4ef6\u7684\u5386\u53f2\ngit log -- filename.txt<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526151518200.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526151518200.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"log\u793a\u4f8b\"\/><\/div><\/figure>\n\n\n\n<h2 class=\"wp-block-heading\">\u534f\u4f5c\u5f00\u53d1\u4e0e\u51b2\u7a81\u5904\u7406<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"5-1-\u9080\u8bf7\u6210\u5458\u52a0\u5165\u4ed3\u5e93\">\u9080\u8bf7\u6210\u5458\u52a0\u5165\u4ed3\u5e93<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u65e0\u8bba\u662f\u5f00\u6e90\u4ed3\u5e93\u8fd8\u662f\u79c1\u6709\u4ed3\u5e93\uff0c<strong>\u53ea\u6709\u4ed3\u5e93\u6210\u5458\u624d\u80fd\u4fee\u6539\u4ee3\u7801<\/strong>\u3002<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>\u5f00\u6e90\u4ed3\u5e93<\/strong>\uff1a\u6240\u6709\u4eba\u53ef\u89c1\uff0c\u4f46\u53ea\u6709\u6210\u5458\u53ef\u4fee\u6539<\/li>\n\n\n\n<li><strong>\u79c1\u6709\u4ed3\u5e93<\/strong>\uff1a\u53ea\u6709\u6307\u5b9a\u6210\u5458\u53ef\u89c1\u548c\u4fee\u6539<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u6dfb\u52a0\u6210\u5458\u6b65\u9aa4<\/strong>\uff1a<\/p>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526152352372.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526152352372.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u9080\u8bf7\u6210\u5458\"\/><\/div><figcaption class=\"wp-element-caption\">\u9080\u8bf7\u6210\u5458<\/figcaption><\/figure>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\"><strong>\u6ce8\u610f<\/strong>\uff1aGitee\u79c1\u6709\u4ed3\u5e93\u514d\u8d39\u7248\u53ea\u80fd\u6dfb\u52a05\u4e2a\u7ba1\u7406\u5458\uff08\u542b\u4e3b\u8d26\u53f7\uff09\u3002\u5982\u9700\u6dfb\u52a0\u66f4\u591a\u6210\u5458\uff0c\u53ef\u5c06\u4ed3\u5e93\u8bbe\u4e3a\u516c\u5f00\u3002<\/p>\n<\/blockquote>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"5-2-\u51b2\u7a81\u7684\u4ea7\u751f\">\u51b2\u7a81\u7684\u4ea7\u751f<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5f53\u591a\u4e2a\u5f00\u53d1\u8005\u540c\u65f6\u4fee\u6539\u540c\u4e00\u6587\u4ef6\u7684\u540c\u4e00\u90e8\u5206\u65f6\uff0c\u5c31\u4f1a\u4ea7\u751f\u51b2\u7a81\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u51b2\u7a81\u4ea7\u751f\u573a\u666f<\/strong>\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u51b2\u7a81\u4ea7\u751f\u573a\u666f<strong>\u5f00\u53d1\u8005 A<\/strong><strong>\u5148\u63d0\u4ea4\u7684\u4e00\u65b9<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4fee\u6539&nbsp;<code>file.txt<\/code>&nbsp;\u540e\u7387\u5148\u63a8\u9001\u6210\u529f\u3002<strong>\u5f00\u53d1\u8005 B<\/strong><strong>\u540e\u63d0\u4ea4\u7684\u4e00\u65b9<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e5f\u4fee\u6539\u4e86\u540c\u4e00\u6587\u4ef6\u7684\u540c\u4e00\u533a\u57df\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e24\u4eba\u540c\u65f6\u4fee\u6539&nbsp;<code>file.txt<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">A \u5148&nbsp;<code>push<\/code>\uff0c\u8fdc\u7a0b\u4ed3\u5e93\u5185\u5bb9\u53d1\u751f\u53d8\u5316<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">B \u518d&nbsp;<code>push<\/code>&nbsp;\u4f1a\u88ab\u62d2\u7edd\uff0c\u9700\u8981\u5148&nbsp;<code>pull<\/code>&nbsp;\u5e76\u5904\u7406\u51b2\u7a81<\/p>\n\n\n\n<h4 class=\"wp-block-heading\">\ud83d\udca1 \u51b2\u7a81\u5904\u7406\u9ec4\u91d1\u6cd5\u5219<\/h4>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u5148push\u7684\u4eba\u4e0d\u5904\u7406\u51b2\u7a81\uff0c\u540epush\u7684\u4eba\u5904\u7406\u51b2\u7a81<\/strong><\/li>\n\n\n\n<li><strong>\u5c3d\u91cf\u907f\u514d\u591a\u4eba\u540c\u65f6\u4fee\u6539\u540c\u4e00\u6587\u4ef6<\/strong><\/li>\n\n\n\n<li><strong>push\u4e4b\u524d\u5148pull<\/strong>\uff0c\u9632\u6b62push\u5931\u8d25<\/li>\n\n\n\n<li><strong>\u5de5\u4f5c\u4e60\u60ef<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u2600\ufe0f \u65e9\u4e0a\u4e0a\u73ed\u7b2c\u4e00\u4ef6\u4e8b\uff1apull\u6700\u65b0\u4ee3\u7801<\/li>\n\n\n\n<li>\ud83c\udf19 \u665a\u4e0a\u4e0b\u73ed\u6700\u540e\u4e00\u4ef6\u4e8b\uff1apush\u672c\u5730\u4ee3\u7801\uff08<strong>\u786e\u4fdd\u80fd\u7f16\u8bd1\u901a\u8fc7<\/strong>\uff09<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"5-3-\u51b2\u7a81\u5904\u7406\u5b9e\u6218\">\u51b2\u7a81\u5904\u7406\u5b9e\u6218<\/h3>\n\n\n\n<h4 class=\"wp-block-heading\">\u6a21\u62df\u51b2\u7a81\u573a\u666f<\/h4>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526162705623.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526162705623.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u51b2\u7a81\u6d41\u7a0b\"\/><\/div><figcaption class=\"wp-element-caption\">\u51b2\u7a81\u6d41\u7a0b<\/figcaption><\/figure>\n\n\n\n<h4 class=\"wp-block-heading\">\u51b2\u7a81\u6587\u4ef6\u793a\u4f8b<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\">\u5f53\u53d1\u751f\u51b2\u7a81\u65f6\uff0cGit\u4f1a\u5728\u6587\u4ef6\u4e2d\u6807\u8bb0\u51b2\u7a81\u5185\u5bb9\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\n    \/\/ \u4f60\u7684\u672c\u5730\u4ee3\u7801\n    System.out.println(\"\u6211\u7684\u7248\u672c\");\n================\n    \/\/ \u8fdc\u7a0b\u4ed3\u5e93\u7684\u4ee3\u7801  \n    System.out.println(\"\u540c\u4e8b\u7684\u7248\u672c\");\n&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt; a3f8b2c<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u6807\u8bb0\u8bf4\u660e<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD<\/code>\u00a0\u5230\u00a0<code>=======<\/code>\uff1a\u4f60\u7684\u672c\u5730\u4ee3\u7801<\/li>\n\n\n\n<li><code>=======<\/code>\u00a0\u5230\u00a0<code>>>>>>>> a3f8b2c<\/code>\uff1a\u8fdc\u7a0b\u7684\u4ee3\u7801\uff08commit hash\uff09<\/li>\n<\/ul>\n\n\n\n<h4 class=\"wp-block-heading\">\u51b2\u7a81\u5904\u7406\u6b65\u9aa4<\/h4>\n\n\n\n<pre class=\"wp-block-code\"><code># 1. \u6267\u884cpull\uff0cGit\u4f1a\u81ea\u52a8\u5408\u5e76\uff0c\u53d1\u751f\u51b2\u7a81\u65f6\u6807\u8bb0\u51b2\u7a81\u6587\u4ef6\ngit pull\n\n# 2. \u624b\u52a8\u7f16\u8f91\u51b2\u7a81\u6587\u4ef6\uff0c\u51b3\u5b9a\u4fdd\u7559\u54ea\u4e9b\u4ee3\u7801\n#    - \u4fdd\u7559\u4f60\u7684\u4ee3\u7801\uff1f\u5220\u9664\u8fdc\u7a0b\u90e8\u5206\n#    - \u4fdd\u7559\u540c\u4e8b\u7684\u4ee3\u7801\uff1f\u5220\u9664\u4f60\u7684\u90e8\u5206\n#    - \u4e24\u8005\u90fd\u8981\uff1f\u5408\u5e76\u4fee\u6539\n\n# 3. \u5220\u9664\u51b2\u7a81\u6807\u8bb0\uff08&lt;&lt;&lt;&lt;&lt;&lt;&lt; ======= &gt;&gt;&gt;&gt;&gt;&gt;&gt;\uff09\n\n# 4. \u4fdd\u5b58\u6587\u4ef6\u540e\uff0c\u6dfb\u52a0\u5230\u6682\u5b58\u533a\ngit add .\n\n# 5. \u63d0\u4ea4\u89e3\u51b3\u51b2\u7a81\u7684\u4ee3\u7801\ngit commit -m \"\u89e3\u51b3\u4e0e\u540c\u4e8b\u7684\u4ee3\u7801\u51b2\u7a81\"\n\n# 6. \u5c3d\u5febpush\uff0c\u9632\u6b62\u522b\u4eba\u53c8push\u4e86\u65b0\u4ee3\u7801\ngit push<\/code><\/pre>\n\n\n\n<h2 class=\"wp-block-heading\">\u7248\u672c\u56de\u9000<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u63d0\u4f9b\u4e86\u591a\u79cd&#8221;\u540e\u6094\u836f&#8221;\uff0c\u53ef\u4ee5\u5728\u4e0d\u540c\u573a\u666f\u4e0b\u56de\u9000\u64cd\u4f5c\u3002<\/p>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526163624301.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526163624301.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u540e\u6094\u836f\u6d41\u7a0b\"\/><\/div><figcaption class=\"wp-element-caption\">\u540e\u6094\u836f\u6d41\u7a0b<\/figcaption><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"6-1-git-checkout---\u64a4\u9500\u5de5\u4f5c\u533a\u4fee\u6539\">git checkout &#8211; \u64a4\u9500\u5de5\u4f5c\u533a\u4fee\u6539<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u4f5c\u7528<\/strong>\uff1a\u7528\u6682\u5b58\u533a\u6216\u4ed3\u5e93\u4e2d\u7684\u6587\u4ef6\u8986\u76d6\u5de5\u4f5c\u533a\u7684\u6587\u4ef6<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u64a4\u9500\u5355\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\ngit checkout filename.txt\n\n# \u64a4\u9500\u6240\u6709\u6587\u4ef6\u7684\u4fee\u6539\uff08\u5371\u9669\u64cd\u4f5c\uff01\uff09\ngit checkout .<\/code><\/pre>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\"><strong>\u5371\u9669\u8b66\u544a<\/strong>\uff1a\u6b64\u64cd\u4f5c\u4f1a\u4e22\u5931\u5de5\u4f5c\u533a\u7684\u6240\u6709\u4fee\u6539\uff0c<strong>\u65e0\u6cd5\u6062\u590d<\/strong>\uff0c\u8bf7\u8c28\u614e\u4f7f\u7528\uff01<\/p>\n<\/blockquote>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u9002\u7528\u573a\u666f<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5199\u4e86\u4e00\u534a\u53d1\u73b0\u601d\u8def\u9519\u4e86\uff0c\u60f3\u56de\u5230\u4fee\u6539\u524d\u7684\u72b6\u6001<\/li>\n\n\n\n<li>\u8bef\u5220\u4e86\u6587\u4ef6\uff0c\u60f3\u4ece\u4ed3\u5e93\u6062\u590d<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"6-2-git-reset---\u64a4\u9500\u6682\u5b58\u533a\">git reset &#8211; \u64a4\u9500\u6682\u5b58\u533a<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u4f5c\u7528<\/strong>\uff1a\u5c06\u6682\u5b58\u533a\u7684\u53d8\u5316\u56de\u9000\u5230\u5de5\u4f5c\u533a\uff08<strong>\u4e0d\u4f1a\u6539\u53d8\u6587\u4ef6\u5185\u5bb9<\/strong>\uff09<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u53d6\u6d88\u6682\u5b58\u533a\u4e2d\u6307\u5b9a\u6587\u4ef6\ngit reset HEAD filename.txt\n\n# \u53d6\u6d88\u6240\u6709\u6682\u5b58\uff08\u4fdd\u7559\u5de5\u4f5c\u533a\u4fee\u6539\uff09\ngit reset HEAD .\n\n# \u6216\u7b80\u5199\ngit reset .<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u9002\u7528\u573a\u666f<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><code>git add<\/code>\u00a0\u9519\u4e86\u6587\u4ef6\uff0c\u60f3\u91cd\u65b0\u9009\u62e9<\/li>\n\n\n\n<li>\u60f3\u62c6\u5206\u4e00\u4e2a\u5927\u7684commit\u4e3a\u591a\u4e2a\u5c0f\u7684<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"6-3-git-reset---hard---\u5f7b\u5e95\u56de\u9000\u7248\u672c\">git reset &#8211;hard &#8211; \u5f7b\u5e95\u56de\u9000\u7248\u672c<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u4f5c\u7528<\/strong>\uff1a\u5c06\u5f53\u524d\u5206\u652f\u91cd\u7f6e\u5230\u6307\u5b9a\u7248\u672c\uff0c<strong>\u4f1a\u6e05\u9664\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u6240\u6709\u66f4\u6539<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u56de\u9000\u5230\u6307\u5b9acommit\uff08\u901a\u8fc7hash\uff09\ngit reset --hard a3f8b2c\n\n# \u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\ngit reset --hard HEAD^\n\n# \u56de\u9000\u5230\u4e0an\u4e2a\u7248\u672c\ngit reset --hard HEAD~3<\/code><\/pre>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\"><strong>\u6781\u5ea6\u5371\u9669<\/strong>\uff1a\u6b64\u64cd\u4f5c\u4f1a\u4e22\u5931\u6240\u6709\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff0c\u8bf7\u786e\u4fdd\u771f\u7684\u4e0d\u9700\u8981\u8fd9\u4e9b\u66f4\u6539\uff01<\/p>\n<\/blockquote>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526171556679.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526171556679.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"reset\u793a\u4f8b\"\/><\/div><figcaption class=\"wp-element-caption\">reset\u793a\u4f8b<\/figcaption><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u627e\u56de\u4e22\u5931\u7684commit<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u67e5\u770b\u6240\u6709\u64cd\u4f5c\u8bb0\u5f55\ngit reflog\n\n# \u6062\u590d\u5230\u4e4b\u524d\u7684\u7248\u672c\ngit reset --hard &lt;commit_hash&gt;<\/code><\/pre>\n\n\n\n<h2 class=\"wp-block-heading\">\u5ffd\u7565\u6587\u4ef6 .gitignore<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"7-1-\u4ec0\u4e48\u662f-gitignore\">\u4ec0\u4e48\u662f.gitignore<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u53ef\u4ee5\u914d\u7f6e\u5ffd\u7565\u67d0\u4e9b\u6587\u4ef6\u6216\u76ee\u5f55\uff0c\u4e0d\u8ffd\u8e2a\u5b83\u4eec\u7684\u53d8\u5316\u3002\u8fd9\u5728\u9879\u76ee\u4e2d\u975e\u5e38\u91cd\u8981\uff0c\u6bd4\u5982\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>IDE\u914d\u7f6e\u6587\u4ef6\uff08<code>.idea\/<\/code>\uff09<\/li>\n\n\n\n<li>\u7f16\u8bd1\u751f\u6210\u7684\u6587\u4ef6\uff08<code>target\/<\/code>\u3001<code>*.class<\/code>\uff09<\/li>\n\n\n\n<li>\u4f9d\u8d56\u5e93\uff08<code>node_modules\/<\/code>\uff09<\/li>\n\n\n\n<li>\u654f\u611f\u4fe1\u606f\uff08\u914d\u7f6e\u6587\u4ef6\u542b\u5bc6\u7801\uff09<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"7-2-\u521b\u5efa-gitignore\">\u521b\u5efa.gitignore<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728Git\u4ed3\u5e93<strong>\u6839\u76ee\u5f55<\/strong>\u521b\u5efa<code>.gitignore<\/code>\u6587\u4ef6\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u521b\u5efa\u6587\u4ef6\uff08Windows\u9700\u8981\u5728\u547d\u4ee4\u884c\u521b\u5efa\uff0c\u56e0\u4e3a\u6587\u4ef6\u540d\u4ee5\u70b9\u5f00\u5934\uff09\ntouch .gitignore<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"7-3-java\u9879\u76ee\u5e38\u7528-gitignore\u6a21\u677f\">Java\u9879\u76ee\u5e38\u7528.gitignore\u6a21\u677f<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code># \u7f16\u8bd1\u8f93\u51fa\n*.class\ntarget\/\nbuild\/\nout\/\n\n# IDE\u914d\u7f6e\n.idea\/\n*.iml\n*.ipr\n*.iws\n.vscode\/\n*.project\n*.classpath\n.settings\/\n\n# \u5305\u6587\u4ef6\n*.jar\n*.war\n*.ear\n*.zip\n*.tar.gz\n*.rar\n\n# \u65e5\u5fd7\n*.log\nlogs\/\n\n# \u4e34\u65f6\u6587\u4ef6\n*.tmp\n*.temp\n*.swp\n*~\n\n# \u64cd\u4f5c\u7cfb\u7edf\u6587\u4ef6\n.DS_Store\nThumbs.db\n\n# Maven\n.mvn\/\n\n# Gradle\n.gradle\/<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"7-4-\u5e38\u7528\u5339\u914d\u89c4\u5219\">\u5e38\u7528\u5339\u914d\u89c4\u5219<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code># \u5ffd\u7565\u5355\u4e2a\u6587\u4ef6\nfilename.txt\n\n# \u5ffd\u7565\u76ee\u5f55\nfoldername\/\n\n# \u5ffd\u7565\u6240\u6709.class\u6587\u4ef6\n*.class\n\n# \u4e0d\u5ffd\u7565\u67d0\u4e2a\u7279\u5b9a\u7684.class\uff08\u53d6\u53cd\uff09\n!important.class\n\n# \u5ffd\u7565target\u76ee\u5f55\u4e0b\u7684\u6240\u6709\u5185\u5bb9\ntarget\/*\n\n# \u5ffd\u7565\u6240\u6709\u540d\u4e3atemp\u7684\u76ee\u5f55\n**\/temp\/<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"7-5-\u91cd\u8981\u6ce8\u610f\u4e8b\u9879\"> \u91cd\u8981\u6ce8\u610f\u4e8b\u9879<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u5c3d\u65e9\u521b\u5efa<\/strong>\uff1a<code>.gitignore<\/code>\u6700\u597d\u5728\u521b\u5efa\u8fdc\u7a0b\u4ed3\u5e93\u65f6\u5c31\u914d\u7f6e\u597d<\/p>\n\n\n\n<ol class=\"wp-block-list\"><\/ol>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/image-20220526172640586.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/image-20220526172640586.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u521b\u5efa\u65f6\u6dfb\u52a0\"\/><\/div><figcaption class=\"wp-element-caption\">\u521b\u5efa\u65f6\u6dfb\u52a0<\/figcaption><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u5df2\u8ffd\u8e2a\u6587\u4ef6\u65e0\u6548<\/strong>\uff1a<strong>\u5982\u679c\u4e00\u4e2a\u6587\u4ef6\u5df2\u7ecf\u88ab\u8ffd\u8e2a\u5e76\u63d0\u4ea4\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u518d\u5728.gitignore\u4e2d\u5ffd\u7565\u662f\u65e0\u6548\u7684<\/strong><\/p>\n\n\n\n<ol class=\"wp-block-list\"><\/ol>\n\n\n\n<p class=\"wp-block-paragraph\">&#8220;`bash<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git rm &#8211;cached filename git commit -m &#8220;\u505c\u6b62\u8ffd\u8e2a\u67d0\u6587\u4ef6&#8221; &#8220;`<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">Git\u5206\u652f\u7ba1\u7406<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"8-1-\u4ec0\u4e48\u662f\u5206\u652f\">\u4ec0\u4e48\u662f\u5206\u652f<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u5206\u652f\u662f\u7248\u672c\u63a7\u5236\u4e2d\u7684\u91cd\u8981\u6982\u5ff5\uff0c\u7528\u4e8e\u5728\u540c\u4e00\u4ed3\u5e93\u4e2d\u72ec\u7acb\u5f00\u53d1\u591a\u4e2a\u529f\u80fd\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u5206\u652f\u7684\u597d\u5904<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u591a\u4eba\u5e76\u884c\u5f00\u53d1\uff0c\u4e92\u4e0d\u5e72\u6270<\/li>\n\n\n\n<li>\u65b0\u529f\u80fd\u5f00\u53d1\u4e0d\u5f71\u54cd\u4e3b\u5206\u652f<\/li>\n\n\n\n<li>\u53ef\u968f\u65f6\u56de\u9000\u5230\u4e4b\u524d\u7684\u72b6\u6001<\/li>\n\n\n\n<li>\u652f\u6301\u7248\u672c\u53d1\u5e03\u548cbug\u4fee\u590d\u5e76\u884c<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u5206\u652f\u7c7b\u578b<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>\u4e3b\u5206\u652f\uff08master\/main\uff09<\/strong>\uff1a\u7a33\u5b9a\u7248\u672c\uff0c\u7528\u4e8e\u53d1\u5e03<\/li>\n\n\n\n<li><strong>\u5f00\u53d1\u5206\u652f\uff08dev\uff09<\/strong>\uff1a\u65e5\u5e38\u5f00\u53d1\uff0c\u5408\u5e76\u65b0\u529f\u80fd<\/li>\n\n\n\n<li>*<em>\u529f\u80fd\u5206\u652f\uff08feature\/<\/em>\uff09**\uff1a\u5f00\u53d1\u7279\u5b9a\u529f\u80fd<\/li>\n\n\n\n<li>*<em>\u4fee\u590d\u5206\u652f\uff08hotfix\/<\/em>\uff09**\uff1a\u7d27\u6025\u4fee\u590d\u7ebf\u4e0abug<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"8-2-\u57fa\u7840\u5206\u652f\u547d\u4ee4\">\u57fa\u7840\u5206\u652f\u547d\u4ee4<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code># \u67e5\u770b\u672c\u5730\u5206\u652f\ngit branch\n\n# \u67e5\u770b\u6240\u6709\u5206\u652f\uff08\u542b\u8fdc\u7a0b\uff09\ngit branch -a\n\n# \u67e5\u770b\u5206\u652f\u5173\u7cfb\uff08\u8ffd\u8e2a\u5173\u7cfb\uff09\ngit branch -vv\n\n# \u521b\u5efa\u65b0\u5206\u652f\ngit branch \u5206\u652f\u540d\n\n# \u521b\u5efa\u5e76\u5207\u6362\u5230\u65b0\u5206\u652f\uff08\u5e38\u7528\uff09\ngit checkout -b \u65b0\u5206\u652f\u540d\n# Git 2.23+ \u63a8\u8350\uff1a\ngit switch -c \u65b0\u5206\u652f\u540d\n\n# \u5207\u6362\u5206\u652f\ngit checkout \u5206\u652f\u540d\n# Git 2.23+ \u63a8\u8350\uff1a\ngit switch \u5206\u652f\u540d\n\n# \u5408\u5e76\u5206\u652f\ngit merge \u88ab\u5408\u5e76\u7684\u5206\u652f\u540d\n\n# \u5220\u9664\u5206\u652f\ngit branch -d \u5206\u652f\u540d        # \u5df2\u5408\u5e76\u7684\u5206\u652f\ngit branch -D \u5206\u652f\u540d        # \u5f3a\u5236\u5220\u9664<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"8-3-\u5206\u652f\u5de5\u4f5c\u6d41\u5b9e\u6218\">\u5206\u652f\u5de5\u4f5c\u6d41\u5b9e\u6218<\/h3>\n\n\n\n<h4 class=\"wp-block-heading\">\u5178\u578b\u4f01\u4e1a\u5206\u652f\u6a21\u578b<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\">\u5178\u578b\u4f01\u4e1a\u5206\u652f\u6a21\u578b<strong>\u4e3b\u7ebf<\/strong><strong>main<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u751f\u4ea7\u73af\u5883\u5206\u652f\uff0c\u53ea\u4fdd\u7559\u7a33\u5b9a\u53ef\u53d1\u5e03\u7684\u7248\u672c\u3002<strong>\u534f\u4f5c\u4e3b\u5e72<\/strong><strong>dev<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u65e5\u5e38\u96c6\u6210\u529f\u80fd\u7684\u4e3b\u5f00\u53d1\u5206\u652f\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">feature\/loginfeature\/paymentfeature\/search<strong>\u7d27\u6025\u4fee\u590d<\/strong><strong>hotfix\/bug-001<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u7ebf\u4e0a\u6545\u969c\u4f18\u5148\u4fee\u590d\uff0c\u5b8c\u6210\u540e\u518d\u56de\u5408\u5e76\u4e3b\u5e72\u3002<\/p>\n\n\n\n<h4 class=\"wp-block-heading\">\u5b9e\u6218\u6b65\u9aa4<\/h4>\n\n\n\n<pre class=\"wp-block-code\"><code># \u573a\u666f\uff1a\u4ecedev\u5206\u652f\u62c9\u53d6\u65b0\u529f\u80fd\u5206\u652f\uff0c\u5f00\u53d1\u5b8c\u6210\u540e\u5408\u5e76\u56dedev\n\n# 1. \u5207\u6362\u5230dev\u5206\u652f\ngit checkout dev\n\n# 2. \u62c9\u53d6\u6700\u65b0\u4ee3\u7801\ngit pull\n\n# 3. \u521b\u5efa\u5e76\u5207\u6362\u5230\u529f\u80fd\u5206\u652f\ngit checkout -b feature\/user-login\n\n# 4. \u5f00\u53d1\u4ee3\u7801\uff0c\u63d0\u4ea4\u5230\u672c\u5730\ngit add .\ngit commit -m \"feat: \u6dfb\u52a0\u7528\u6237\u767b\u5f55\u529f\u80fd\"\n\n# 5. \u5f00\u53d1\u5b8c\u6210\uff0c\u5207\u6362\u5230dev\u5206\u652f\ngit checkout dev\n\n# 6. \u5408\u5e76\u529f\u80fd\u5206\u652f\u5230dev\ngit merge feature\/user-login\n\n# 7. \u63a8\u9001dev\u5230\u8fdc\u7a0b\ngit push origin dev\n\n# 8. \u5220\u9664\u5df2\u5408\u5e76\u7684\u529f\u80fd\u5206\u652f\ngit branch -d feature\/user-login<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"8-4-\u672c\u5730\u5206\u652f\u4e0e\u8fdc\u7a0b\u5206\u652f\">\u672c\u5730\u5206\u652f\u4e0e\u8fdc\u7a0b\u5206\u652f<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code># \u67e5\u770b\u6240\u6709\u5206\u652f\uff08\u672c\u5730+\u8fdc\u7a0b\uff09\ngit branch -a\n\n# \u63a8\u9001\u672c\u5730\u5206\u652f\u5230\u8fdc\u7a0b\uff08\u9996\u6b21\uff09\ngit push origin \u672c\u5730\u5206\u652f\u540d\n\n# \u63a8\u9001\u5e76\u5efa\u7acb\u8ffd\u8e2a\u5173\u7cfb\uff08\u63a8\u8350\uff09\ngit push -u origin \u672c\u5730\u5206\u652f\u540d\n\n# \u67e5\u770b\u5206\u652f\u8ffd\u8e2a\u5173\u7cfb\ngit branch -vv\n\n# \u4e3a\u5df2\u6709\u672c\u5730\u5206\u652f\u5efa\u7acb\u4e0e\u8fdc\u7a0b\u5206\u652f\u7684\u8ffd\u8e2a\u5173\u7cfb\ngit branch --set-upstream-to=origin\/\u8fdc\u7a0b\u5206\u652f\u540d \u672c\u5730\u5206\u652f\u540d\n\n# \u793a\u4f8b\uff1a\u672c\u5730dev\u5206\u652f\u8ffd\u8e2a\u8fdc\u7a0bdev\u5206\u652f\ngit branch --set-upstream-to=origin\/dev dev\n\n# \u68c0\u51fa\u8fdc\u7a0b\u5206\u652f\u5230\u672c\u5730\uff08\u521b\u5efa\u672c\u5730\u5206\u652f\u5e76\u5efa\u7acb\u8ffd\u8e2a\uff09\ngit checkout -b dev origin\/dev\n\n# Git 2.23+ \u63a8\u8350\u5199\u6cd5\ngit switch -c dev --track origin\/dev<\/code><\/pre>\n\n\n\n<h2 class=\"wp-block-heading\">\u5728IDEA\u4e2d\u4f7f\u7528Git<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"9-1-\u914d\u7f6egit\u8def\u5f84\">\u914d\u7f6eGit\u8def\u5f84<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u6253\u5f00IDEA\u8bbe\u7f6e\uff1a<code>File<\/code>&nbsp;\u2192&nbsp;<code>Settings<\/code>&nbsp;\u2192&nbsp;<code>Version Control<\/code>&nbsp;\u2192&nbsp;<code>Git<\/code><\/p>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/idea%E9%85%8D%E7%BD%AEgit.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/idea%E9%85%8D%E7%BD%AEgit.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u914d\u7f6eGit\"\/><\/div><figcaption class=\"wp-element-caption\">\u914d\u7f6eGit<\/figcaption><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\">\u8bbe\u7f6eGit\u53ef\u6267\u884c\u6587\u4ef6\u8def\u5f84\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>Windows:\u00a0<code>C:\\Program Files\\Git\\bin\\git.exe<\/code><\/li>\n\n\n\n<li>Mac:\u00a0<code>\/usr\/bin\/git<\/code><\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\">\u70b9\u51fb&#8221;Test&#8221;\u6309\u94ae\uff0c\u663e\u793a\u7248\u672c\u53f7\u5373\u914d\u7f6e\u6210\u529f\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"9-2-\u9879\u76ee\u989c\u8272\u6807\u8bc6\">\u9879\u76ee\u989c\u8272\u6807\u8bc6<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5982\u679c\u9879\u76ee\u88abGit\u8ffd\u8e2a\uff0cIDEA\u4f1a\u7528\u989c\u8272\u6807\u8bc6\u6587\u4ef6\u72b6\u6001\uff1a<\/p>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th class=\"has-text-align-left\" data-align=\"left\">\u989c\u8272<\/th><th class=\"has-text-align-left\" data-align=\"left\">\u542b\u4e49<\/th><\/tr><\/thead><tbody><tr><td class=\"has-text-align-left\" data-align=\"left\">\ud83d\udd34&nbsp;<strong>\u7ea2\u8272<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u65b0\u589e\u6587\u4ef6\uff0c\u672a\u8ffd\u8e2a\uff08Untracked\uff09<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\">\ud83d\udd35&nbsp;<strong>\u84dd\u8272<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u6587\u4ef6\u6709\u4fee\u6539\uff08Modified\uff09<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\">\ud83d\udfe2&nbsp;<strong>\u7eff\u8272<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u5df2\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff08Staged\uff09<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\">\u26aa&nbsp;<strong>\u767d\u8272\/\u9ed1\u8272<\/strong><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u65e0\u53d8\u5316\uff0c\u5df2\u63d0\u4ea4<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<figure class=\"wp-block-image\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='http:\/\/118.25.99.91\/image\/git\/\/idea%E4%B8%ADgit%E7%9A%84%E6%8F%90%E7%A4%BA.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"http:\/\/118.25.99.91\/image\/git\/\/idea%E4%B8%ADgit%E7%9A%84%E6%8F%90%E7%A4%BA.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\u6587\u4ef6\u989c\u8272\"\/><\/div><figcaption class=\"wp-element-caption\">\u6587\u4ef6\u989c\u8272<\/figcaption><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"9-3-\u5e38\u7528git\u64cd\u4f5c\">\u5e38\u7528Git\u64cd\u4f5c<\/h3>\n\n\n\n<h4 class=\"wp-block-heading\">\u53f3\u952e\u83dc\u5355\u64cd\u4f5c<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728\u6587\u4ef6\u6216\u9879\u76ee\u4e0a\u53f3\u952e \u2192&nbsp;<code>Git<\/code>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>Add<\/strong>\uff1a\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff08\u76f8\u5f53\u4e8e<code>git add<\/code>\uff09<\/li>\n\n\n\n<li><strong>Commit<\/strong>\uff1a\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff08\u76f8\u5f53\u4e8e<code>git commit<\/code>\uff09<\/li>\n\n\n\n<li><strong>Push<\/strong>\uff1a\u63a8\u9001\u5230\u8fdc\u7a0b\uff08\u76f8\u5f53\u4e8e<code>git push<\/code>\uff09<\/li>\n\n\n\n<li><strong>Pull<\/strong>\uff1a\u62c9\u53d6\u8fdc\u7a0b\u66f4\u65b0\uff08\u76f8\u5f53\u4e8e<code>git pull<\/code>\uff09<\/li>\n<\/ul>\n\n\n\n<h4 class=\"wp-block-heading\">\u5feb\u6377\u952e<\/h4>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th class=\"has-text-align-left\" data-align=\"left\">\u64cd\u4f5c<\/th><th class=\"has-text-align-left\" data-align=\"left\">Windows\u5feb\u6377\u952e<\/th><\/tr><\/thead><tbody><tr><td class=\"has-text-align-left\" data-align=\"left\">Commit<\/td><td class=\"has-text-align-left\" data-align=\"left\"><code>Ctrl + K<\/code><\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\">Push<\/td><td class=\"has-text-align-left\" data-align=\"left\"><code>Ctrl + Shift + K<\/code><\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\">Pull<\/td><td class=\"has-text-align-left\" data-align=\"left\"><code>Ctrl + T<\/code><\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\">\u67e5\u770bVCS\u64cd\u4f5c<\/td><td class=\"has-text-align-left\" data-align=\"left\"><code>Alt + ~<\/code><\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"9-4-\u67e5\u770b\u6587\u4ef6\u53d8\u52a8\">\u67e5\u770b\u6587\u4ef6\u53d8\u52a8<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728\u4ee3\u7801\u7f16\u8f91\u5668\u5de6\u4fa7\uff0c\u53ef\u4ee5\u770b\u5230\u6587\u4ef6\u7684\u53d8\u52a8\u6807\u8bb0\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u7eff\u8272\u6761\uff1a\u65b0\u589e\u7684\u884c<\/li>\n\n\n\n<li>\u84dd\u8272\u6761\uff1a\u4fee\u6539\u7684\u884c<\/li>\n\n\n\n<li>\u7ea2\u8272\u4e09\u89d2\uff1a\u5220\u9664\u7684\u884c<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\">\u70b9\u51fb\u6807\u8bb0\u53ef\u4ee5\u67e5\u770b\u4e0e\u4e0a\u4e00\u7248\u672c\u7684\u5bf9\u6bd4\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"9-5-\u5206\u652f\u7ba1\u7406\">\u5206\u652f\u7ba1\u7406<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5e95\u90e8\u72b6\u6001\u680f\u70b9\u51fb\u5206\u652f\u540d\u79f0\uff0c\u53ef\u4ee5\u5feb\u901f\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5207\u6362\u5206\u652f<\/li>\n\n\n\n<li>\u521b\u5efa\u65b0\u5206\u652f<\/li>\n\n\n\n<li>\u5408\u5e76\u5206\u652f<\/li>\n\n\n\n<li>\u67e5\u770b\u5206\u652f\u56fe<\/li>\n<\/ul>\n\n\n\n<h2 class=\"wp-block-heading\">\u5e38\u89c1\u95ee\u9898\u4e0e\u89e3\u51b3\u65b9\u6848\uff08FAQ\uff09<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q1-\u63d0\u4ea4\u65f6\u63d0\u793a-please-tell-me-who-you-are\">Q1: \u63d0\u4ea4\u65f6\u63d0\u793a&#8221;Please tell me who you are&#8221;<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u95ee\u9898<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>*** Please tell me who you are.\nRun:\n  git config --global user.email \"you@example.com\"\n  git config --global user.name \"Your Name\"<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git config --global user.name \"\u4f60\u7684\u540d\u5b57\"\ngit config --global user.email \"\u4f60\u7684\u90ae\u7bb1\"<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q2-push\u65f6\u63d0\u793a-failed-to-push-some-refs\">Q2: push\u65f6\u63d0\u793a&#8221;failed to push some refs&#8221;<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u95ee\u9898<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>! &#91;rejected]        main -&gt; main (fetch first)\nerror: failed to push some refs to 'https:\/\/gitee.com\/xxx\/xxx.git'<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u539f\u56e0<\/strong>\uff1a\u8fdc\u7a0b\u4ed3\u5e93\u6709\u66f4\u65b0\uff0c\u672c\u5730\u843d\u540e\u4e8e\u8fdc\u7a0b\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u5148\u62c9\u53d6\u8fdc\u7a0b\u66f4\u65b0\ngit pull\n\n# \u5904\u7406\u53ef\u80fd\u7684\u51b2\u7a81\u540e\uff0c\u518dpush\ngit push<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q3-\u5fd8\u8bb0\u6dfb\u52a0-gitignore-\u5df2\u7ecf\u63d0\u4ea4\u4e86\u4e0d\u8be5\u63d0\u4ea4\u7684\u6587\u4ef6\">Q3: \u5fd8\u8bb0\u6dfb\u52a0.gitignore\uff0c\u5df2\u7ecf\u63d0\u4ea4\u4e86\u4e0d\u8be5\u63d0\u4ea4\u7684\u6587\u4ef6<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># 1. \u6dfb\u52a0.gitignore\u6587\u4ef6\uff08\u5305\u542b\u8981\u5ffd\u7565\u7684\u6587\u4ef6\uff09\n\n# 2. \u4ece\u4ed3\u5e93\u4e2d\u79fb\u9664\u6587\u4ef6\uff0c\u4f46\u4fdd\u7559\u672c\u5730\u6587\u4ef6\ngit rm --cached filename\n\n# 3. \u5982\u679c\u662f\u76ee\u5f55\ngit rm -r --cached foldername\n\n# 4. \u63d0\u4ea4\u66f4\u6539\ngit add .\ngit commit -m \"\u6dfb\u52a0.gitignore\uff0c\u505c\u6b62\u8ffd\u8e2a\u67d0\u4e9b\u6587\u4ef6\"<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q4-\u8bef\u5220\u4e86\u6587\u4ef6-\u672acommit-\u5982\u4f55\u6062\u590d\">Q4: \u8bef\u5220\u4e86\u6587\u4ef6\uff08\u672acommit\uff09\uff0c\u5982\u4f55\u6062\u590d<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u6062\u590d\u5de5\u4f5c\u533a\u6587\u4ef6\uff08\u4ece\u6682\u5b58\u533a\u6216\u4ed3\u5e93\u6062\u590d\uff09\ngit checkout -- \u6587\u4ef6\u540d\n\n# \u6062\u590d\u6240\u6709\u6587\u4ef6\ngit checkout .<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q5-\u8bef\u5220\u4e86\u6587\u4ef6-\u5df2commit-\u5982\u4f55\u6062\u590d\">Q5: \u8bef\u5220\u4e86\u6587\u4ef6\uff08\u5df2commit\uff09\uff0c\u5982\u4f55\u6062\u590d<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u67e5\u770b\u6587\u4ef6\u5386\u53f2\ngit log -- \u6587\u4ef6\u540d\n\n# \u6062\u590d\u5230\u6307\u5b9a\u7248\u672c\ngit checkout &lt;commit_hash&gt; -- \u6587\u4ef6\u540d\n\n# \u6216\ngit restore --source=&lt;commit_hash&gt; -- \u6587\u4ef6\u540d<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q6-commit\u4fe1\u606f\u5199\u9519\u4e86-\u5982\u4f55\u4fee\u6539\">Q6: commit\u4fe1\u606f\u5199\u9519\u4e86\uff0c\u5982\u4f55\u4fee\u6539<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u4fee\u6539\u6700\u540e\u4e00\u6b21commit\u4fe1\u606f\uff08\u672apush\u65f6\uff09\ngit commit --amend -m \"\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\"\n\n# \u4fee\u6539\u6700\u540e\u4e00\u6b21commit\uff0c\u6dfb\u52a0\u6f0f\u6389\u7684\u6587\u4ef6\ngit add \u6f0f\u6389\u7684\u6587\u4ef6\ngit commit --amend --no-edit<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q7-\u5982\u4f55\u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u662f\u8c01\u4fee\u6539\u7684\">Q7: \u5982\u4f55\u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u662f\u8c01\u4fee\u6539\u7684<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u67e5\u770b\u6587\u4ef6\u7684\u4fee\u6539\u5386\u53f2\ngit blame \u6587\u4ef6\u540d\n\n# \u67e5\u770b\u8be6\u7ec6\u4fee\u6539\u5185\u5bb9\ngit log -p -- \u6587\u4ef6\u540d<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q8-windows\u548cmac\u6362\u884c\u7b26\u4e0d\u4e00\u81f4\u5bfc\u81f4\u7684\u95ee\u9898\">Q8: Windows\u548cMac\u6362\u884c\u7b26\u4e0d\u4e00\u81f4\u5bfc\u81f4\u7684\u95ee\u9898<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u95ee\u9898<\/strong>\uff1aWindows\u4f7f\u7528CRLF\uff08<code>\\r\\n<\/code>\uff09\uff0cMac\/Linux\u4f7f\u7528LF\uff08<code>\\n<\/code>\uff09\uff0c\u6df7\u7528\u4f1a\u5bfc\u81f4diff\u663e\u793a\u6574\u884c\u53d8\u66f4\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># Windows\u7528\u6237\u914d\u7f6e\uff08\u63d0\u4ea4\u65f6\u81ea\u52a8\u8f6c\u6362\uff09\ngit config --global core.autocrlf true\n\n# Mac\/Linux\u7528\u6237\u914d\u7f6e\ngit config --global core.autocrlf input\n\n# \u5173\u95ed\u81ea\u52a8\u8f6c\u6362\uff08\u4e0d\u63a8\u8350\uff09\ngit config --global core.autocrlf false<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q9-\u5927\u6587\u4ef6\u8bef\u63d0\u4ea4\u5230\u4ed3\u5e93\">Q9: \u5927\u6587\u4ef6\u8bef\u63d0\u4ea4\u5230\u4ed3\u5e93<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u95ee\u9898<\/strong>\uff1aGit\u4e0d\u9002\u5408\u7ba1\u7406\u5927\u6587\u4ef6\uff0c\u4f1a\u5bfc\u81f4\u4ed3\u5e93\u81c3\u80bf\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u4ece\u5386\u53f2\u4e2d\u5f7b\u5e95\u5220\u9664\u5927\u6587\u4ef6\uff08\u614e\u7528\uff0c\u4f1a\u91cd\u5199\u5386\u53f2\uff09\ngit filter-branch --force --index-filter \\\n  'git rm --cached --ignore-unmatch \u5927\u6587\u4ef6\u540d' \\\n  --prune-empty --tag-name-filter cat -- --all<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u6216\u4f7f\u7528BFG Repo-Cleaner\u5de5\u5177\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>bfg --delete-files \u5927\u6587\u4ef6\u540d<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"q10-github-gitee\u8fde\u63a5\u8d85\u65f6\u6216\u5931\u8d25\">Q10: GitHub\/Gitee\u8fde\u63a5\u8d85\u65f6\u6216\u5931\u8d25<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u89e3\u51b3<\/strong>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u8bbe\u7f6e\u4ee3\u7406\uff08\u5982\u679c\u6709\uff09\ngit config --global http.proxy http:\/\/127.0.0.1:7890\ngit config --global https.proxy https:\/\/127.0.0.1:7890\n\n# \u53d6\u6d88\u4ee3\u7406\ngit config --global --unset http.proxy\ngit config --global --unset https.proxy\n\n# \u4f7f\u7528SSH\u534f\u8bae\u66ff\u4ee3HTTPS\uff08\u66f4\u7a33\u5b9a\uff09\n# \u5c06 https:\/\/github.com\/xxx\/xxx.git\n# \u6539\u4e3a git@github.com:xxx\/xxx.git<\/code><\/pre>\n\n\n\n<h2 class=\"wp-block-heading\">\u9644\u5f55\uff1aGit\u547d\u4ee4\u901f\u67e5\u8868<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"\u57fa\u7840\u547d\u4ee4\">\u57fa\u7840\u547d\u4ee4<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th class=\"has-text-align-left\" data-align=\"left\">\u547d\u4ee4<\/th><th class=\"has-text-align-left\" data-align=\"left\">\u4f5c\u7528<\/th><\/tr><\/thead><tbody><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git init<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u521d\u59cb\u5316\u4ed3\u5e93<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git clone &lt;url&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u514b\u9686\u8fdc\u7a0b\u4ed3\u5e93<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git status<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u67e5\u770b\u72b6\u6001<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git add &lt;file&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u6dfb\u52a0\u5230\u6682\u5b58\u533a<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git commit -m \"msg\"<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git push<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u63a8\u9001\u5230\u8fdc\u7a0b<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git pull<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u62c9\u53d6\u8fdc\u7a0b\u66f4\u65b0<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git log<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u67e5\u770b\u5386\u53f2<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"\u5206\u652f\u547d\u4ee4\">\u5206\u652f\u547d\u4ee4<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th class=\"has-text-align-left\" data-align=\"left\">\u547d\u4ee4<\/th><th class=\"has-text-align-left\" data-align=\"left\">\u4f5c\u7528<\/th><\/tr><\/thead><tbody><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git branch<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u67e5\u770b\u5206\u652f<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git branch &lt;name&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u521b\u5efa\u5206\u652f<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git checkout &lt;name&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u5207\u6362\u5206\u652f<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git checkout -b &lt;name&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u521b\u5efa\u5e76\u5207\u6362<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git merge &lt;name&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u5408\u5e76\u5206\u652f<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git branch -d &lt;name&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u5220\u9664\u5206\u652f<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"\u64a4\u9500\u547d\u4ee4\">\u64a4\u9500\u547d\u4ee4<\/h3>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th class=\"has-text-align-left\" data-align=\"left\">\u547d\u4ee4<\/th><th class=\"has-text-align-left\" data-align=\"left\">\u4f5c\u7528<\/th><th class=\"has-text-align-left\" data-align=\"left\">\u5371\u9669\u7a0b\u5ea6<\/th><\/tr><\/thead><tbody><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git checkout -- &lt;file&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u64a4\u9500\u5de5\u4f5c\u533a\u4fee\u6539<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u26a0\ufe0f \u9ad8<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git reset HEAD &lt;file&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u64a4\u9500\u6682\u5b58\u533a<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u2705 \u4f4e<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git reset --hard &lt;hash&gt;<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u56de\u9000\u7248\u672c<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u26a0\ufe0f\u26a0\ufe0f \u6781\u9ad8<\/td><\/tr><tr><td class=\"has-text-align-left\" data-align=\"left\"><code>git reflog<\/code><\/td><td class=\"has-text-align-left\" data-align=\"left\">\u67e5\u770b\u64cd\u4f5c\u5386\u53f2<\/td><td class=\"has-text-align-left\" data-align=\"left\">\u2705 \u5b89\u5168<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\"><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Git\u4ecb\u7ecd Git \u662f\u7531 Linus Torvalds\uff08Linux\u4e4b\u7236\uff09\u5f00\u53d1\u7684\u7b2c\u4e8c\u4e2a\u4f1f\u5927\u4f5c\u54c1\u30022005\u5e74\uff0c\u7531\u4e8e [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[6],"class_list":["post-175","post","type-post","status-publish","format-standard","hentry","category-learn","tag-6"],"_links":{"self":[{"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/posts\/175","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/comments?post=175"}],"version-history":[{"count":1,"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/posts\/175\/revisions"}],"predecessor-version":[{"id":177,"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/posts\/175\/revisions\/177"}],"wp:attachment":[{"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/media?parent=175"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/categories?post=175"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/larkdrop.cafe\/index.php\/wp-json\/wp\/v2\/tags?post=175"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}