{"id":603,"date":"2018-02-23T23:48:55","date_gmt":"2018-02-23T15:48:55","guid":{"rendered":"http:\/\/60.205.208.74\/2018\/02\/23\/git-%e5%88%86%e6%94%af%e7%ae%a1%e7%90%86\/"},"modified":"2018-02-23T23:48:55","modified_gmt":"2018-02-23T15:48:55","slug":"git-%e5%88%86%e6%94%af%e7%ae%a1%e7%90%86","status":"publish","type":"post","link":"https:\/\/www.puzi7.net\/?p=603","title":{"rendered":"Git \u5206\u652f\u7ba1\u7406"},"content":{"rendered":"
\n
\n

Git \u5206\u652f\u7ba1\u7406<\/h1>\n

\n\u51e0\u4e4e\u6bcf\u4e00\u79cd\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u90fd\u4ee5\u67d0\u79cd\u5f62\u5f0f\u652f\u6301\u5206\u652f\u3002\u4f7f\u7528\u5206\u652f\u610f\u5473\u7740\u4f60\u53ef\u4ee5\u4ece\u5f00\u53d1\u4e3b\u7ebf\u4e0a\u5206\u79bb\u5f00\u6765\uff0c\u7136\u540e\u5728\u4e0d\u5f71\u54cd\u4e3b\u7ebf\u7684\u540c\u65f6\u7ee7\u7eed\u5de5\u4f5c\u3002\n<\/p>\n

\u6709\u4eba\u628a Git \u7684\u5206\u652f\u6a21\u578b\u79f0\u4e3a”\u5fc5\u6740\u6280\u7279\u6027”\uff0c\u800c\u6b63\u662f\u56e0\u4e3a\u5b83\uff0c\u5c06 Git \u4ece\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u5bb6\u65cf\u91cc\u533a\u5206\u51fa\u6765\u3002<\/p>\n

\n\u521b\u5efa\u5206\u652f\u547d\u4ee4\uff1a<\/p>\n

git branch (branchname)<\/pre>\n
\n\u5207\u6362\u5206\u652f\u547d\u4ee4:<\/p>\n
git checkout (branchname)<\/pre>\n
\u5f53\u4f60\u5207\u6362\u5206\u652f\u7684\u65f6\u5019\uff0cGit \u4f1a\u7528\u8be5\u5206\u652f\u7684\u6700\u540e\u63d0\u4ea4\u7684\u5feb\u7167\u66ff\u6362\u4f60\u7684\u5de5\u4f5c\u76ee\u5f55\u7684\u5185\u5bb9\uff0c \u6240\u4ee5\u591a\u4e2a\u5206\u652f\u4e0d\u9700\u8981\u591a\u4e2a\u76ee\u5f55\u3002<\/p>\n
\u5408\u5e76\u5206\u652f\u547d\u4ee4:<\/p>\n
git merge <\/pre>\n
\u4f60\u53ef\u4ee5\u591a\u6b21\u5408\u5e76\u5230\u7edf\u4e00\u5206\u652f\uff0c \u4e5f\u53ef\u4ee5\u9009\u62e9\u5728\u5408\u5e76\u4e4b\u540e\u76f4\u63a5\u5220\u9664\u88ab\u5e76\u5165\u7684\u5206\u652f\u3002\n<\/p>\n
\n
Git \u5206\u652f\u7ba1\u7406<\/h2>\n
\u5217\u51fa\u5206\u652f<\/h3>\n
\u5217\u51fa\u5206\u652f\u57fa\u672c\u547d\u4ee4\uff1a<\/p>\n
git branch<\/pre>\n
\u6ca1\u6709\u53c2\u6570\u65f6\uff0cgit branch \u4f1a\u5217\u51fa\u4f60\u5728\u672c\u5730\u7684\u5206\u652f\u3002<\/p>\n
\n$ git branch\n* master\n<\/pre>\n
\u6b64\u4f8b\u7684\u610f\u601d\u5c31\u662f\uff0c\u6211\u4eec\u6709\u4e00\u4e2a\u53eb\u505a”master”\u7684\u5206\u652f\uff0c\u5e76\u4e14\u8be5\u5206\u652f\u662f\u5f53\u524d\u5206\u652f\u3002 <\/p>\n
\u5f53\u4f60\u6267\u884c git init \u7684\u65f6\u5019\uff0c\u7f3a\u7701\u60c5\u51b5\u4e0b Git \u5c31\u4f1a\u4e3a\u4f60\u521b\u5efa”master”\u5206\u652f\u3002<\/p>\n
\u5982\u679c\u6211\u4eec\u8981\u624b\u52a8\u521b\u5efa\u4e00\u4e2a\u5206\u652f\u3002\u6267\u884c git branch (branchname) \u5373\u53ef\u3002\n<\/p>\n
\n$ git branch testing\n$ git branch\n* master\n  testing\n<\/pre>\n
\n\u73b0\u5728\u6211\u4eec\u53ef\u4ee5\u770b\u5230\uff0c\u6709\u4e86\u4e00\u4e2a\u65b0\u5206\u652f testing\u3002<\/p>\n
\u5f53\u4f60\u4ee5\u6b64\u65b9\u5f0f\u5728\u4e0a\u6b21\u63d0\u4ea4\u66f4\u65b0\u4e4b\u540e\u521b\u5efa\u4e86\u65b0\u5206\u652f\uff0c\u5982\u679c\u540e\u6765\u53c8\u6709\u66f4\u65b0\u63d0\u4ea4\uff0c \u7136\u540e\u53c8\u5207\u6362\u5230\u4e86”testing”\u5206\u652f\uff0cGit \u5c06\u8fd8\u539f\u4f60\u7684\u5de5\u4f5c\u76ee\u5f55\u5230\u4f60\u521b\u5efa\u5206\u652f\u65f6\u5019\u7684\u6837\u5b50\n<\/p>\n
\u63a5\u4e0b\u6765\u6211\u4eec\u5c06\u6f14\u793a\u5982\u4f55\u5207\u6362\u5206\u652f\uff0c\u6211\u4eec\u7528 git checkout (branch) \u5207\u6362\u5230\u6211\u4eec\u8981\u4fee\u6539\u7684\u5206\u652f\u3002<\/p>\n
\n$ ls\nREADME\n$ echo 'runoob.com' > test.txt\n$ git add .\n$ git commit -m 'add test.txt'\n[master 048598f] add test.txt\n 2 files changed, 1 insertion(+), 3 deletions(-)\n delete mode 100644 hello.php\n create mode 100644 test.txt\n$ ls\nREADME\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0test.txt\n$ git checkout testing\nSwitched to branch 'testing'\n$ ls\nREADME\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0hello.php\n<\/pre>\n
\u5f53\u6211\u4eec\u5207\u6362\u5230”testing”\u5206\u652f\u7684\u65f6\u5019\uff0c\u6211\u4eec\u6dfb\u52a0\u7684\u65b0\u6587\u4ef6test.txt\u88ab\u79fb\u9664\u4e86, \u539f\u6765\u88ab\u5220\u9664\u7684\u6587\u4ef6hello.php\u6587\u4ef6\u53c8\u51fa\u73b0\u4e86\u3002\u5207\u6362\u56de”master”\u5206\u652f\u7684\u65f6\u5019\uff0c\u5b83\u4eec\u6709\u91cd\u65b0\u51fa\u73b0\u4e86\u3002<\/p>\n
\n$ git checkout master\nSwitched to branch 'master'\n$ ls\nREADME\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0test.txt\n<\/pre>\n
\u6211\u4eec\u4e5f\u53ef\u4ee5\u4f7f\u7528 git checkout -b (branchname)  \u547d\u4ee4\u6765\u521b\u5efa\u65b0\u5206\u652f\u5e76\u7acb\u5373\u5207\u6362\u5230\u8be5\u5206\u652f\u4e0b\uff0c\u4ece\u800c\u5728\u8be5\u5206\u652f\u4e2d\u64cd\u4f5c\u3002<\/p>\n
\n$ git checkout -b newtest\nSwitched to a new branch 'newtest'\n$ git rm test2.txt \nrm 'test2.txt'\n$ ls\nREADME\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0test.txt\n$ git commit -am 'removed test2.txt'\n[newtest 556f0a0] removed test2.txt\n 1 file changed, 1 deletion(-)\n delete mode 100644 test2.txt\n$ git checkout master\nSwitched to branch 'master'\n$ ls\nREADME\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0test.txt\u00a0\u00a0\u00a0\u00a0test2.txt\n<\/pre>\n
\u5982\u4f60\u6240\u89c1\uff0c\u6211\u4eec\u521b\u5efa\u4e86\u4e00\u4e2a\u5206\u652f\uff0c\u5728\u8be5\u5206\u652f\u7684\u4e0a\u4e0b\u6587\u4e2d\u79fb\u9664\u4e86\u4e00\u4e9b\u6587\u4ef6\uff0c\u7136\u540e\u5207\u6362\u56de\u6211\u4eec\u7684\u4e3b\u5206\u652f\uff0c\u90a3\u4e9b\u6587\u4ef6\u53c8\u56de\u6765\u4e86\u3002 <\/p>\n
\u4f7f\u7528\u5206\u652f\u5c06\u5de5\u4f5c\u5207\u5206\u5f00\u6765\uff0c\u4ece\u800c\u8ba9\u6211\u4eec\u80fd\u591f\u5728\u4e0d\u540c\u4e0a\u4e0b\u6587\u4e2d\u505a\u4e8b\uff0c\u5e76\u6765\u56de\u5207\u6362\u3002<\/p>\n
\u5220\u9664\u5206\u652f<\/h3>\n
\u5220\u9664\u5206\u652f\u547d\u4ee4\uff1a<\/p>\n
git branch -d (branchname)<\/pre>\n
\u4f8b\u5982\u6211\u4eec\u8981\u5220\u9664”testing”\u5206\u652f\uff1a<\/p>\n
\n$ git branch\n* master\n  testing\n$ git branch -d testing\nDeleted branch testing (was 85fc7e7).\n$ git branch\n* master\n<\/pre>\n
\u5206\u652f\u5408\u5e76<\/h3>\n
\u4e00\u65e6\u67d0\u5206\u652f\u6709\u4e86\u72ec\u7acb\u5185\u5bb9\uff0c\u4f60\u7ec8\u7a76\u4f1a\u5e0c\u671b\u5c06\u5b83\u5408\u5e76\u56de\u5230\u4f60\u7684\u4e3b\u5206\u652f\u3002 \u4f60\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4efb\u4f55\u5206\u652f\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u4e2d\u53bb\uff1a<\/p>\n
\ngit merge<\/pre>\n
\n$ git branch\n* master\n  newtest\n$ ls\nREADME\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0test.txt\u00a0\u00a0\u00a0\u00a0test2.txt\n$ git merge newtest\nUpdating 2e082b7..556f0a0\nFast-forward\n test2.txt | 1 -\n 1 file changed, 1 deletion(-)\n delete mode 100644 test2.txt\n$ ls\nREADME\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0test.txt\n<\/pre>\n
\u4ee5\u4e0a\u5b9e\u4f8b\u4e2d\u6211\u4eec\u5c06 newtest \u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u53bb\uff0ctest2.txt \u6587\u4ef6\u88ab\u5220\u9664\u3002<\/p>\n
\u5408\u5e76\u51b2\u7a81<\/h3>\n
\u5408\u5e76\u5e76\u4e0d\u4ec5\u4ec5\u662f\u7b80\u5355\u7684\u6587\u4ef6\u6dfb\u52a0\u3001\u79fb\u9664\u7684\u64cd\u4f5c\uff0cGit \u4e5f\u4f1a\u5408\u5e76\u4fee\u6539\u3002<\/p>\n
\n$ git branch\n* master\n$ cat test.txt\nrunoob.com\n<\/pre>\n
\u9996\u5148\uff0c\u6211\u4eec\u521b\u5efa\u4e00\u4e2a\u53eb\u505a”change_site”\u7684\u5206\u652f\uff0c\u5207\u6362\u8fc7\u53bb\uff0c\u6211\u4eec\u5c06\u5185\u5bb9\u6539\u4e3a www.runoob.com \u3002<\/p>\n
\n$ git checkout -b change_site\nSwitched to a new branch 'change_site'\n$ vim test.txt \n$ head -1 test.txt \nwww.runoob.com\n$ git commit -am 'changed the site'\n[change_site d7e7346] changed the site\n 1 file changed, 1 insertion(+), 1 deletion(-)\n <\/pre>\n
\u5c06\u4fee\u6539\u7684\u5185\u5bb9\u63d0\u4ea4\u5230 “change_site” \u5206\u652f\u4e2d\u3002 \u73b0\u5728\uff0c\u5047\u5982\u5207\u6362\u56de “master” \u5206\u652f\u6211\u4eec\u53ef\u4ee5\u770b\u5185\u5bb9\u6062\u590d\u5230\u6211\u4eec\u4fee\u6539\u524d\u7684\uff0c\u6211\u4eec\u518d\u6b21\u4fee\u6539test.txt\u6587\u4ef6\u3002\n <\/p>\n
\n$ git checkout master\nSwitched to branch 'master'\n$ head -1 test.txt \nrunoob.com\n$ vim test.txt \n$ cat test.txt\nrunoob.com\n\u65b0\u589e\u52a0\u4e00\u884c\n$ git diff\ndiff --git a\/test.txt b\/test.txt\nindex 704cce7..f84c2a4 100644\n--- a\/test.txt\n+++ b\/test.txt\n@@ -1 +1,2 @@\n runoob.com\n+\u65b0\u589e\u52a0\u4e00\u884c\n$ git commit -am '\u65b0\u589e\u52a0\u4e00\u884c'\n[master 14b4dca] \u65b0\u589e\u52a0\u4e00\u884c\n 1 file changed, 1 insertion(+)\n <\/pre>\n
\u73b0\u5728\u8fd9\u4e9b\u6539\u53d8\u5df2\u7ecf\u8bb0\u5f55\u5230\u6211\u7684 “master” \u5206\u652f\u4e86\u3002\u63a5\u4e0b\u6765\u6211\u4eec\u5c06 “change_site” \u5206\u652f\u5408\u5e76\u8fc7\u6765\u3002<\/p>\n
\n $ git merge change_site\nAuto-merging test.txt\nCONFLICT (content): Merge conflict in test.txt\nAutomatic merge failed; fix conflicts and then commit the result.\n$ cat test.txt \n<<<<<<< HEAD\nrunoob.com\n\u65b0\u589e\u52a0\u4e00\u884c\n=======\nwww.runoob.com\n>>>>>>> change_site\n<\/pre>\n
\u6211\u4eec\u5c06\u524d\u4e00\u4e2a\u5206\u652f\u5408\u5e76\u5230 “master” \u5206\u652f\uff0c\u4e00\u4e2a\u5408\u5e76\u51b2\u7a81\u5c31\u51fa\u73b0\u4e86\uff0c\u63a5\u4e0b\u6765\u6211\u4eec\u9700\u8981\u624b\u52a8\u53bb\u4fee\u6539\u5b83\u3002<\/p>\n
\n$ vim test.txt \n$ cat test.txt \nwww.runoob.com\n\u65b0\u589e\u52a0\u4e00\u884c\n$ git diff\ndiff --cc test.txt\nindex f84c2a4,bccb7c2..0000000\n--- a\/test.txt\n+++ b\/test.txt\n@@@ -1,2 -1,1 +1,2 @@@\n- runoob.com\n+ www.runoob.com\n +\u65b0\u589e\u52a0\u4e00\u884c\n<\/pre>\n
\u5728 Git \u4e2d\uff0c\u6211\u4eec\u53ef\u4ee5\u7528 git add \u8981\u544a\u8bc9 Git \u6587\u4ef6\u51b2\u7a81\u5df2\u7ecf\u89e3\u51b3<\/p>\n
\n$ git status -s\nUU test.txt\n$ git add test.txt \n$ git status -s\nM  test.txt\n$ git commit\n[master 88afe0e] Merge branch 'change_site'\n<\/pre>\n
\u73b0\u5728\u6211\u4eec\u6210\u529f\u89e3\u51b3\u4e86\u5408\u5e76\u4e2d\u7684\u51b2\u7a81\uff0c\u5e76\u63d0\u4ea4\u4e86\u7ed3\u679c\u3002<\/p>\n<\/p><\/div>\n<\/p><\/div>\n","protected":false},"excerpt":{"rendered":"
Git \u5206\u652f\u7ba1\u7406 \u51e0\u4e4e\u6bcf\u4e00\u79cd\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u90fd\u4ee5\u67d0\u79cd\u5f62\u5f0f\u652f\u6301\u5206\u652f\u3002\u4f7f\u7528\u5206\u652f\u610f\u5473\u7740\u4f60\u53ef\u4ee5\u4ece\u5f00\u53d1\u4e3b…<\/span><\/p>\n
Read More<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[20],"tags":[64,137],"class_list":["post-603","post","type-post","status-publish","format-standard","hentry","category-git","tag-git","tag-tool","zoom-theme-has-thumb"],"_links":{"self":[{"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/posts\/603","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=603"}],"version-history":[{"count":0,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/posts\/603\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.puzi7.net\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=603"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=603"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=603"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}