{"id":5706,"date":"2022-03-26T13:02:30","date_gmt":"2022-03-26T05:02:30","guid":{"rendered":"https:\/\/damogame.cn:15443\/wordpress\/?p=5706"},"modified":"2022-03-26T13:02:30","modified_gmt":"2022-03-26T05:02:30","slug":"git%e4%bd%bf%e7%94%a8%e5%91%bd%e4%bb%a4-%e7%89%b9%e5%88%abgit-checkout-b-a-%e4%b8%8e-git-branch-a%e5%8c%ba%e5%88%ab","status":"publish","type":"post","link":"https:\/\/i007.cc\/wordpress\/archives\/5706","title":{"rendered":"git\u4f7f\u7528\u547d\u4ee4, \u7279\u522b:git checkout -b a \u4e0e git branch a\u533a\u522b"},"content":{"rendered":"<div class=\"article-box__header\">\n<p class=\"article-box__title\"><a href=\"https:\/\/my.oschina.net\/u\/587974\/blog\/74341\">\u539f\u6587\u5730\u5740<\/a><\/p>\n<div class=\"article-box__meta\">\n<div class=\"item-list\">\n<div class=\"item lm\"><\/div>\n<\/div>\n<\/div>\n<\/div>\n<div class=\"article-box__content\">\n<div class=\"detail-box\">\n<div class=\"article-detail\">\n<div class=\"content\">\n<p>\u521b\u5efa\u5206\u652f\uff1a $ git branch mybranch<br \/>\n\u5207\u6362\u5206\u652f\uff1a $ git checkout mybranch<br \/>\n\u521b\u5efa\u5e76\u5207\u6362\u5206\u652f\uff1a $ git checkout -b mybranch<\/p>\n<p>\u66f4\u65b0master\u4e3b\u7ebf\u4e0a\u7684\u4e1c\u897f\u5230\u8be5\u5206\u652f\u4e0a\uff1a$git rebase master<\/p>\n<p>\u5207\u6362\u5230master\u5206\u652f\uff1a$git checkout master<\/p>\n<p>\u66f4\u65b0mybranch\u5206\u652f\u4e0a\u7684\u4e1c\u897f\u5230master\u4e0a\uff1a$git rebase mybranch<\/p>\n<p>\u63d0\u4ea4\uff1agit commit -a<\/p>\n<p>\u5bf9\u6700\u8fd1\u4e00\u6b21commit\u7684\u8fdb\u884c\u4fee\u6539\uff1agit commit -a \u2013amend<\/p>\n<p>commit\u4e4b\u540e\uff0c\u5982\u679c\u60f3\u64a4\u9500\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4(\u5373\u9000\u56de\u5230\u4e0a\u4e00\u6b21\u7248\u672c)\u5e76\u672c\u5730\u4fdd\u7559\u4ee3\u7801\uff1agit reset HEAD^<br \/>\n\u5408\u5e76\u5206\u652f\uff1a(merge from) $ git checkout master<br \/>\n$ git merge mybranch (merge from mybranch)<br \/>\n\u5220\u9664\u5206\u652f\uff1a $ git branch -d mybranch<br \/>\n\u5f3a\u5236\u5220\u9664\u5206\u652f\uff1a $ git branch -D mybranch<br \/>\n\u5217\u51fa\u6240\u6709\u5206\u652f\uff1a $ git branch<br \/>\n\u67e5\u770b\u5404\u4e2a\u5206\u652f\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\uff1a $ git branch -v<\/p>\n<p>\u67e5\u770b\u54ea\u4e9b\u5206\u652f\u5408\u5e76\u5165\u5f53\u524d\u5206\u652f\uff1a $ git branch \u2013merged<\/p>\n<p>\u67e5\u770b\u54ea\u4e9b\u5206\u652f\u672a\u5408\u5e76\u5165\u5f53\u524d\u5206\u652f\uff1a $ git branch \u2013no-merged<\/p>\n<p>\u66f4\u65b0\u8fdc\u7a0b\u5e93\u5230\u672c\u5730\uff1a $ git fetch origin<br \/>\n\u63a8\u9001\u5206\u652f\uff1a $ git push origin mybranch<br \/>\n\u53d6\u8fdc\u7a0b\u5206\u652f\u5408\u5e76\u5230\u672c\u5730\uff1a $ git merge origin\/mybranch<br \/>\n\u53d6\u8fdc\u7a0b\u5206\u652f\u5e76\u5206\u5316\u4e00\u4e2a\u65b0\u5206\u652f\uff1a $ git checkout -b mybranch origin\/mybranch<br \/>\n\u5220\u9664\u8fdc\u7a0b\u5206\u652f\uff1a\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000$ git push origin :mybranch<\/p>\n<p>rebase: $ git checkout mybranch<br \/>\n$ git rebase master (rebase from master)<\/p>\n<p>\u4e3e\u4f8b\uff1a $ git checkout server<br \/>\n$ git rebase \u2013onto master server client<br \/>\n$ git checkout master<br \/>\n$ git merge client (fostforward)<br \/>\n$ git rebase master server (checkout sever)<br \/>\n$ git merge server<br \/>\n$ git branch -d client<br \/>\n$ git branch -d server<\/p>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n","protected":false},"excerpt":{"rendered":"<p>\u539f\u6587\u5730\u5740 \u521b\u5efa\u5206\u652f\uff1a $ git bra<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"colormag_page_container_layout":"default_layout","colormag_page_sidebar_layout":"default_layout","footnotes":""},"categories":[24],"tags":[121],"class_list":["post-5706","post","type-post","status-publish","format-standard","hentry","category-value_docs","tag-05-"],"_links":{"self":[{"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/posts\/5706","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/comments?post=5706"}],"version-history":[{"count":0,"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/posts\/5706\/revisions"}],"wp:attachment":[{"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/media?parent=5706"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/categories?post=5706"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/i007.cc\/wordpress\/wp-json\/wp\/v2\/tags?post=5706"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}