{"id":420,"date":"2021-04-22T21:09:58","date_gmt":"2021-04-22T13:09:58","guid":{"rendered":"https:\/\/blog.iyatt.com\/?p=420"},"modified":"2024-05-05T14:19:48","modified_gmt":"2024-05-05T06:19:48","slug":"git-%e4%bd%bf%e7%94%a8","status":"publish","type":"post","link":"https:\/\/blog.iyatt.com\/?p=420","title":{"rendered":"git \u4f7f\u7528"},"content":{"rendered":"<div id=\"ez-toc-container\" class=\"ez-toc-v2_0_82_2 ez-toc-wrap-center counter-hierarchy ez-toc-counter ez-toc-light-blue ez-toc-container-direction\">\n<div class=\"ez-toc-title-container\">\n<p class=\"ez-toc-title ez-toc-toggle\" style=\"cursor:pointer\">\u76ee\u5f55<\/p>\n<span class=\"ez-toc-title-toggle\"><a href=\"#\" class=\"ez-toc-pull-right ez-toc-btn ez-toc-btn-xs ez-toc-btn-default ez-toc-toggle\" aria-label=\"Toggle Table of Content\"><span class=\"ez-toc-js-icon-con\"><span class=\"\"><span class=\"eztoc-hide\" style=\"display:none;\">Toggle<\/span><span class=\"ez-toc-icon-toggle-span\"><svg style=\"fill: #999;color:#999\" xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"list-377408\" width=\"20px\" height=\"20px\" viewBox=\"0 0 24 24\" fill=\"none\"><path d=\"M6 6H4v2h2V6zm14 0H8v2h12V6zM4 11h2v2H4v-2zm16 0H8v2h12v-2zM4 16h2v2H4v-2zm16 0H8v2h12v-2z\" fill=\"currentColor\"><\/path><\/svg><svg style=\"fill: #999;color:#999\" class=\"arrow-unsorted-368013\" xmlns=\"http:\/\/www.w3.org\/2000\/svg\" width=\"10px\" height=\"10px\" viewBox=\"0 0 24 24\" version=\"1.2\" baseProfile=\"tiny\"><path d=\"M18.2 9.3l-6.2-6.3-6.2 6.3c-.2.2-.3.4-.3.7s.1.5.3.7c.2.2.4.3.7.3h11c.3 0 .5-.1.7-.3.2-.2.3-.5.3-.7s-.1-.5-.3-.7zM5.8 14.7l6.2 6.3 6.2-6.3c.2-.2.3-.5.3-.7s-.1-.5-.3-.7c-.2-.2-.4-.3-.7-.3h-11c-.3 0-.5.1-.7.3-.2.2-.3.5-.3.7s.1.5.3.7z\"\/><\/svg><\/span><\/span><\/span><\/a><\/span><\/div>\n<nav><ul class='ez-toc-list ez-toc-list-level-1 ' ><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-1\" href=\"https:\/\/blog.iyatt.com\/?p=420\/#Git_%E5%92%8C_GitHub\" >Git \u548c GitHub<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-2\" href=\"https:\/\/blog.iyatt.com\/?p=420\/#%E5%88%86%E6%94%AF%E4%BD%BF%E7%94%A8\" >\u5206\u652f\u4f7f\u7528<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-3\" href=\"https:\/\/blog.iyatt.com\/?p=420\/#%E6%8F%90%E4%BA%A4Git%E4%BB%A3%E7%A0%81\" >\u63d0\u4ea4Git\u4ee3\u7801<\/a><\/li><\/ul><\/nav><\/div>\n\n<p>Git Book\uff1a<a href=\"https:\/\/git-scm.com\/book\/zh\" target=\"_blank\" rel=\"noreferrer noopener\">https:\/\/git-scm.com\/book\/zh<\/a><\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img decoding=\"async\" width=\"974\" height=\"947\" data-src=\"https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-211029.png\" alt=\"\" class=\"wp-image-425 lazyload\" data-srcset=\"https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-211029.png 974w, https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-211029-300x292.png 300w, https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-211029-768x747.png 768w\" data-sizes=\"(max-width: 974px) 100vw, 974px\" src=\"data:image\/svg+xml;base64,PHN2ZyB3aWR0aD0iMSIgaGVpZ2h0PSIxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjwvc3ZnPg==\" style=\"--smush-placeholder-width: 974px; --smush-placeholder-aspect-ratio: 974\/947;\" \/><\/figure>\n\n\n\n<h2 class=\"wp-block-heading\"><span class=\"ez-toc-section\" id=\"Git_%E5%92%8C_GitHub\"><\/span>Git \u548c GitHub<span class=\"ez-toc-section-end\"><\/span><\/h2>\n\n\n\n<p><strong>\u8bbe\u7f6e\u8eab\u4efd\u4fe1\u606f<\/strong><\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git config --global user.email 'GitHub\u90ae\u7bb1'\n\ngit config --global user.name 'GitHub\u7528\u6237\u540d'<\/pre>\n\n\n\n<p><strong>\u914d\u7f6essh\u9a8c\u8bc1<\/strong><\/p>\n\n\n\n<p>\u751f\u6210ssh\u5bc6\u94a5<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">ssh-keygen -C '[\u90ae\u7bb1]' -t rsa -b 4096<\/pre>\n\n\n\n<p>\u5c06 ~\/.ssh\/id_rsa.pub \u4e2d\u7684\u5185\u5bb9\u6dfb\u52a0\u5230 https:\/\/github.com\/settings\/keys<\/p>\n\n\n\n<p>\u6d4b\u8bd5ssh\u5bc6\u94a5\uff0c\u6267\u884c\u547d\u4ee4\uff0c\u6210\u529f\u8fd4\u56de <span style=\"color:#a3002c\" class=\"has-inline-color\">Hi xxxx! You&#8217;ve successfully authenticated, but GitHub does not provide shell access.<\/span><\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">ssh -T git@github.com<\/pre>\n\n\n\n<p><strong>\u4f7f\u7528Git\u4ece\u672c\u5730\u4e0a\u4f20\u5230GitHub<\/strong><\/p>\n\n\n\n<p>\u8fdb\u5165\u76ee\u6807\u6587\u4ef6\u5939\uff0c\u6267\u884c\u547d\u4ee4\u521d\u59cb\u5316<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git init<\/pre>\n\n\n\n<p>\u521b\u5efa\u4e3b\u5206\u652f<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git branch -M main<\/pre>\n\n\n\n<p>\u521b\u5efa\u672c\u5730\u4ed3\u5e93 <span style=\"color:#2600a3\" class=\"has-inline-color\">origin<\/span><\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git remote add origin git@github.com:[\u7528\u6237\u540d]\/[GitHub\u4e0a\u65b0\u5efa\u7684\u8fdc\u7a0b\u4ed3\u5e93\u540d].git<\/pre>\n\n\n\n<p>\u6dfb\u52a0\u6587\u4ef6\u5230\u7f13\u51b2\u533a<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\"># \u6dfb\u52a0\u6307\u5b9a\u6587\u4ef6\ngit add [\u6587\u4ef6\u540d]<\/pre>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\"># \u81ea\u52a8\u5224\u65ad\u8981\u6dfb\u52a0\u7684\u6587\u4ef6\ngit add .<\/pre>\n\n\n\n<p>\u7136\u540e\u63d0\u4ea4\u6587\u4ef6\u5230\u672c\u5730\u4ed3\u5e93<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git commit -m '[\u6ce8\u91ca]'<\/pre>\n\n\n\n<figure class=\"wp-block-image size-large\"><img decoding=\"async\" width=\"583\" height=\"797\" data-src=\"https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-191929.png\" alt=\"\" class=\"wp-image-421 lazyload\" data-srcset=\"https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-191929.png 583w, https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-191929-219x300.png 219w\" data-sizes=\"(max-width: 583px) 100vw, 583px\" src=\"data:image\/svg+xml;base64,PHN2ZyB3aWR0aD0iMSIgaGVpZ2h0PSIxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjwvc3ZnPg==\" style=\"--smush-placeholder-width: 583px; --smush-placeholder-aspect-ratio: 583\/797;\" \/><\/figure>\n\n\n\n<p>\u63a8\u9001\u5230GitHub<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git push -u origin main<\/pre>\n\n\n\n<h2 class=\"wp-block-heading\"><span class=\"ez-toc-section\" id=\"%E5%88%86%E6%94%AF%E4%BD%BF%E7%94%A8\"><\/span>\u5206\u652f\u4f7f\u7528<span class=\"ez-toc-section-end\"><\/span><\/h2>\n\n\n\n<p>git branch [\u5206\u652f\u540d\u79f0]    \u521b\u5efa\u5206\u652f<\/p>\n\n\n\n<p>git checkout [\u5206\u652f\u540d\u79f0]    \u5207\u6362\u5206\u652f<\/p>\n\n\n\n<p><\/p>\n\n\n\n<p>git merge [\u5206\u652f\u540d\u79f0]    \u5c06\u6307\u5b9a\u5206\u652f\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f<\/p>\n\n\n\n<p>\u5f53\u4e24\u4e2a\u5206\u652f\u4fee\u6539\u540c\u4e00\u4e2a\u6587\u4ef6\u540e\uff0c\u5728\u5408\u5e76\u5206\u652f\u65f6\u4f1a\u53d1\u751f\u51b2\u7a81\uff0c\u9700\u8981\u624b\u52a8\u7f16\u8f91\u88ab\u4fee\u6539\u6587\u4ef6\uff0c\u89e3\u51b3\u51b2\u7a81\u540e\u518d\u63d0\u4ea4\u3002\u5728\u5408\u5e76\u5206\u652f\u65f6\uff0cGit \u4f1a\u7528 Fast Forward \u6a21\u5f0f\uff0c\u5728\u8fd9\u79cd\u6a21\u5f0f\u4e0b\uff0c\u5220\u9664\u5206\u652f\u540e\u4f1a\u4e22\u6389\u5206\u652f\u4fe1\u606f\u3002<\/p>\n\n\n\n<p>\u53ef\u4ee5\u6dfb\u52a0\u53c2\u6570 <span style=\"color:#a34200\" class=\"has-inline-color\">-no-ff<\/span> \u6765\u5f3a\u5236\u5173\u95ed Fast Forward \u6a21\u5f0f\uff0c\u5728\u666e\u901a\u6a21\u5f0f\u4e0b\uff0c\u5408\u5e76\u540e\u7684\u5386\u53f2\u6709\u5206\u652f\uff0c\u80fd\u770b\u51fa\u6765\u66fe\u7ecf\u505a\u8fc7\u5408\u5e76\u3002<\/p>\n\n\n\n<p><\/p>\n\n\n\n<p>git branch -d [\u5206\u652f\u540d]    \u5220\u9664\u5206\u652f<\/p>\n\n\n\n<p><\/p>\n\n\n\n<p>git log ( &#8211;graph &#8211;pretty=oneline &#8211;abbrev-commit )    \u4ea7\u770b\u5206\u652f\u7684\u63d0\u4ea4\u53f7<\/p>\n\n\n\n<p>git branch [\u5206\u652f\u540d\u79f0] [\u63d0\u4ea4\u53f7]    \u6062\u590d\u5206\u652f<\/p>\n\n\n\n<h2 class=\"wp-block-heading\"><span class=\"ez-toc-section\" id=\"%E6%8F%90%E4%BA%A4Git%E4%BB%A3%E7%A0%81\"><\/span>\u63d0\u4ea4Git\u4ee3\u7801<span class=\"ez-toc-section-end\"><\/span><\/h2>\n\n\n\n<p>git pull    \u62c9\u53d6\u670d\u52a1\u5668\u4ee3\u7801\uff08\u5728\u63d0\u4ea4\u524d\uff0c\u5148\u62c9\u53d6\u670d\u52a1\u5668\u4e0a\u7684\u4ee3\u7801\uff0c\u4ee5\u9632\u8986\u76d6\u522b\u4eba\u7684\u4ee3\u7801\uff09<\/p>\n\n\n\n<p><\/p>\n\n\n\n<p>git status    \u67e5\u770b\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u6811\u4fee\u6539\u72b6\u6001<\/p>\n\n\n\n<p>untracked:\uff1a\u672a\u8ffd\u8e2a\uff0c\u6b64\u6587\u4ef6\u5728\u6587\u4ef6\u5939\u4e2d\uff0c\u4f46\u5e76\u6ca1\u6709\u52a0\u5165git\u5e93\uff0c\u4e0d\u53c2\u4e0e\u7248\u672c\u63a7\u5236\u3002\u901a\u8fc7 git add \u547d\u4ee4\u53ef\u5c06\u72b6\u6001\u6539\u4e3a Staged\u3002<\/p>\n\n\n\n<p>Modified\uff1a\u6587\u4ef6\u5df2\u4fee\u6539\uff0c\u4ec5\u4ec5\u662f\u4fee\u6539\uff0c\u5e76\u6ca1\u6709\u8fdb\u884c\u5176\u5b83\u7684\u64cd\u4f5c\u3002<\/p>\n\n\n\n<p>Deleted\uff1a\u6587\u4ef6\u5df2\u5220\u9664\uff0c\u4ec5\u5728\u672c\u5730\u5220\u9664\uff0c\u5728\u670d\u52a1\u5668\u8fd8\u6ca1\u6709\u5220\u9664\u3002<\/p>\n\n\n\n<p>renamed\uff1a\u6587\u4ef6\u5df2\u6539\u540d\u3002<\/p>\n\n\n\n<p><\/p>\n\n\n\n<p>git add [\u6587\u4ef6\u540d]    \u63d0\u4ea4\u6587\u4ef6\u5230\u7f13\u51b2\u533a<\/p>\n\n\n\n<p>git commit -m \u2018[\u6ce8\u91ca]&#8217;    \u6dfb\u52a0\u5230\u4ed3\u5e93<\/p>\n\n\n\n<p>git push    \u5c06\u4ee3\u7801\u63a8\u9001\u5230\u670d\u52a1\u5668<\/p>\n\n\n\n<p>git reset    \u64a4\u56de\u63d0\u4ea4\u5230\u7f13\u51b2\u533a\u7684\u6587\u4ef6<\/p>\n\n\n\n<p>git reset -soft [\u63d0\u4ea4\u53f7]    \u56de\u9000\u7248\u672c\u53f7\uff0c\u4e0d\u6062\u590d\u6587\u4ef6<\/p>\n\n\n\n<p>git reset -hard [\u63d0\u4ea4\u53f7]    \u56de\u9000\u5230\u76f8\u5e94\u7684\u7248\u672c<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img decoding=\"async\" width=\"531\" height=\"231\" data-src=\"https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-210849.png\" alt=\"\" class=\"wp-image-423 lazyload\" data-srcset=\"https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-210849.png 531w, https:\/\/blog.iyatt.com\/wp-content\/uploads\/2021\/04\/\u5c4f\u5e55\u622a\u56fe-2021-04-22-210849-300x131.png 300w\" data-sizes=\"(max-width: 531px) 100vw, 531px\" src=\"data:image\/svg+xml;base64,PHN2ZyB3aWR0aD0iMSIgaGVpZ2h0PSIxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjwvc3ZnPg==\" style=\"--smush-placeholder-width: 531px; --smush-placeholder-aspect-ratio: 531\/231;\" \/><\/figure>\n\n\n\n<p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Git Book\uff1ahttps:\/\/git-scm.com\/book\/zh Git \u548c GitHub \u8bbe\u7f6e\u8eab\u4efd\u4fe1 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"zakra_page_container_layout":"customizer","zakra_page_sidebar_layout":"customizer","zakra_remove_content_margin":false,"zakra_sidebar":"customizer","zakra_transparent_header":"customizer","zakra_logo":0,"zakra_main_header_style":"default","zakra_menu_item_color":"","zakra_menu_item_hover_color":"","zakra_menu_item_active_color":"","zakra_menu_active_style":"","zakra_page_header":true,"_lmt_disableupdate":"","_lmt_disable":"","footnotes":""},"categories":[1],"tags":[],"class_list":["post-420","post","type-post","status-publish","format-standard","hentry","category-all"],"modified_by":"IYATT-yx","_links":{"self":[{"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=\/wp\/v2\/posts\/420","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=420"}],"version-history":[{"count":0,"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=\/wp\/v2\/posts\/420\/revisions"}],"wp:attachment":[{"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=420"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=420"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.iyatt.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=420"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}