{"id":618,"date":"2018-11-26T15:49:22","date_gmt":"2018-11-26T07:49:22","guid":{"rendered":"https:\/\/wyxxt.org.cn\/?p=618"},"modified":"2023-12-04T17:07:57","modified_gmt":"2023-12-04T09:07:57","slug":"git%e5%91%bd%e4%bb%a44","status":"publish","type":"post","link":"https:\/\/wyxxt.org.cn\/?p=618","title":{"rendered":"git\u5408\u5e76\u5206\u652f\u547d\u4ee4"},"content":{"rendered":"<h2>\u6807\u7b7e<\/h2>\n<h3>\u6dfb\u52a0\u672c\u5730\u6807\u7b7e<\/h3>\n<pre><code class=\"language-shell line-numbers\">git tag v2.1\n<\/code><\/pre>\n<h3>\u5207\u6362\u5230\u6807\u7b7e\u5bf9\u5e94\u7248\u672c<\/h3>\n<pre><code class=\"language-shell line-numbers\">git checkout v2.1\n<\/code><\/pre>\n<h3>\u5220\u9664\u672c\u5730\u6807\u7b7e<\/h3>\n<pre><code class=\"language-shell line-numbers\">git tad -d v2.1\n<\/code><\/pre>\n<h3>\u63a8\u9001\u6807\u7b7e\u5230\u8fdc\u7a0b<\/h3>\n<pre><code class=\"language-shell line-numbers\">git push --tags\n<\/code><\/pre>\n<h3>\u5220\u9664\u8fdc\u7a0b\u6807\u7b7e<\/h3>\n<pre><code class=\"language-shell line-numbers\">git push origin :refs\/tags\/v2.1\n<\/code><\/pre>\n<h2>\u5206\u652f<\/h2>\n<h3>\u529f\u80fd\u5206\u652f feature<\/h3>\n<pre><code class=\"language-shell line-numbers\">git checkout -b feature-x dev\ngit checkout dev\ngit merge --no-ff feature-x\ngit branch -d feature-x\n<\/code><\/pre>\n<h3>\u9884\u53d1\u5e03\u5206\u652f release<\/h3>\n<h3>\u4fee\u8865bug\u5206\u652f fixbug<\/h3>\n<h3>\u65b0\u5efa\u672c\u5730\u5206\u652f<\/h3>\n<pre><code class=\"language-shell line-numbers\">git checkout -b dev master #dev \u6765\u6e90\u4e8emaster\n<\/code><\/pre>\n<h3>\u63a8\u9001\u5206\u652f\u5230\u8fdc\u7a0b<\/h3>\n<pre><code class=\"language-shell line-numbers\">git push --set-upstream origin dev\n<\/code><\/pre>\n<h3>\u5220\u9664\u672c\u5730\u5206\u652f<\/h3>\n<pre><code class=\"language-shell line-numbers\">git branch -d dev_v2\n<\/code><\/pre>\n<h3>\u5220\u9664\u8fdc\u7a0b\u5206\u652f<\/h3>\n<pre><code class=\"language-shell line-numbers\">git push origin --delete dev_v2\n<\/code><\/pre>\n<h3>\u540c\u6b65\u8fdc\u7a0b\u5206\u652f\u5230\u672c\u5730<\/h3>\n<pre><code class=\"language-shell line-numbers\">git pull -p\n<\/code><\/pre>\n<h3>\u5408\u5e76\u5206\u652f<\/h3>\n<pre><code class=\"language-shell line-numbers\">git checkout master\ngit merge --no-ff dev\n<\/code><\/pre>\n<h3>\u5408\u5e76\u51b2\u7a81\u68c0\u6d4b<\/h3>\n<pre><code class=\"language-shell line-numbers\">git diff --check\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u6807\u7b7e \u6dfb\u52a0\u672c\u5730\u6807\u7b7e git tag v2.1 \u5207\u6362\u5230\u6807\u7b7e\u5bf9\u5e94\u7248\u672c git checkout v2.1 \u5220\u9664\u672c\u5730 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"site-sidebar-layout":"default","site-content-layout":"","ast-site-content-layout":"default","site-content-style":"default","site-sidebar-style":"default","ast-global-header-display":"","ast-banner-title-visibility":"","ast-main-header-display":"","ast-hfb-above-header-display":"","ast-hfb-below-header-display":"","ast-hfb-mobile-header-display":"","site-post-title":"","ast-breadcrumbs-content":"","ast-featured-img":"","footer-sml-layout":"","ast-disable-related-posts":"","theme-transparent-header-meta":"","adv-header-id-meta":"","stick-header-meta":"","header-above-stick-meta":"","header-main-stick-meta":"","header-below-stick-meta":"","astra-migrate-meta-layouts":"default","ast-page-background-enabled":"default","ast-page-background-meta":{"desktop":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"ast-content-background-meta":{"desktop":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"footnotes":""},"categories":[15],"tags":[415],"class_list":["post-618","post","type-post","status-publish","format-standard","hentry","category-15","tag-git"],"_links":{"self":[{"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=\/wp\/v2\/posts\/618","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=618"}],"version-history":[{"count":6,"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=\/wp\/v2\/posts\/618\/revisions"}],"predecessor-version":[{"id":3672,"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=\/wp\/v2\/posts\/618\/revisions\/3672"}],"wp:attachment":[{"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=618"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=618"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/wyxxt.org.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=618"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}