{"id":152393,"date":"2020-09-07T11:08:57","date_gmt":"2020-09-07T03:08:57","guid":{"rendered":"http:\/\/4563.org\/?p=152393"},"modified":"2020-09-07T11:08:57","modified_gmt":"2020-09-07T03:08:57","slug":"git-%e5%a6%82%e4%bd%95%e6%9f%a5%e7%9c%8b%e6%9f%90%e4%b8%aa%e6%96%87%e4%bb%b6%e6%98%af%e4%bb%80%e4%b9%88%e6%97%b6%e5%80%99-%e6%9d%a5%e5%88%b0-%e5%bd%93%e5%89%8d%e8%bf%99%e4%b8%aa","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=152393","title":{"rendered":"git \u5982\u4f55\u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u662f\u4ec0\u4e48\u65f6\u5019 \u201c\u6765\u5230\u201d \u5f53\u524d\u8fd9\u4e2a\u5206\u652f\u7684"},"content":{"rendered":"<div>\n<div>\n<div>\n<h1>                  git \u5982\u4f55\u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u662f\u4ec0\u4e48\u65f6\u5019 \u201c\u6765\u5230\u201d \u5f53\u524d\u8fd9\u4e2a\u5206\u652f\u7684               <\/h1>\n<p> <\/p>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : 5ispy <\/span>  <span><i><\/i> 19<\/span> <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n<div isfirst=\"1\">                        \u5177\u4f53\u573a\u666f\uff1a\u6709\u4e2a\u5206\u652f branch-a\uff0c\u91cc\u9762\u6709\u4e2a\u6587\u4ef6 hello.java\uff0c\u73b0\u5728\u60f3\u77e5\u9053\u8fd9\u4e2a hello.java \u6587\u4ef6\u4ec0\u4e48\u65f6\u5019\u201c\u6765\u5230\u201d\u8fd9\u4e2a\u5206\u652f\u7684\u3002<br \/>\u76ee\u524d\u80fd\u60f3\u5230\u4e24\u79cd\u60c5\u51b5\uff1a<br \/>\u5982\u679c\u662f\u67d0\u4e2a\u4eba\u76f4\u63a5\u5728\u8fd9\u4e2a\u5206\u652f\u65b0\u5efa\u7684\uff0c\u600e\u4e48\u67e5\u51fa\u6765\u662f\u8c01\u5728\u4ec0\u4e48\u65f6\u5019\u65b0\u5efa\u7684\uff1f<br \/>\u5982\u679c\u662f\u67d0\u4e2a\u4eba\u628a\u5176\u4ed6\u5206\u652f merge \u8fc7\u6765\u7684\uff0c\u600e\u4e48\u67e5\u51fa\u6765\u662f\u8c01\u5728\u4ec0\u4e48\u65f6\u5019 merge \u7684\uff0c\u5bfc\u81f4\u8fd9\u4e2a\u6587\u4ef6\u6765\u5230\u4e86\u5f53\u524d\u8fd9\u4e2a\u5206\u652f\uff1f<\/p>\n<p>\u53e6\u5916\uff1a<br \/>IDEA \u4e0a\u67e5\u770b history\uff0c\u6216\u8005 git log\uff0c\u53ea\u80fd\u67e5\u770b commit \u7684\u8bb0\u5f55\uff0c\u65e0\u6cd5\u5206\u8fa8\u662f\u5728\u8fd9\u4e2a\u5206\u652f\u65b0\u5efa\u7684\u8fd8\u662f\u4ece\u522b\u7684\u5206\u652f merge \u8fc7\u6765\u7684\uff0c      <\/div>\n<div> <b>\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (<span>4<\/span>)        <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<ul>\n<li data-pid=\"3004297\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : DCCooper <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u5207\u5230\u5f53\u524d\u4f60\u8981\u67e5\u770b\u7684\u5206\u652f\uff0cgit blame hello.java                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"3004298\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : momocraft <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u65e0\u6cd5\u7b80\u5355\u5206\u8fa8<br \/>\u5206\u652f\u4e0d\u62e5\u6709 commit \u3002\u5404\u79cd\u65b9\u6cd5\u53ea\u80fd\u770b\u5230\u6587\u4ef6\u662f\u4ece\u54ea\u4e2a commit \u5f00\u59cb\u5b58\u5728\u7684\uff0c\u65e0\u4ece\u77e5\u9053\u90a3\u4e2a commit \u5f53\u65f6\u662f\u5728\u54ea\u4e2a\u5206\u652f\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"3004299\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : msg7086 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             Blame \u4e00\u8def\u5f80\u4e0a\u627e\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"3004300\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : I2E <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             git log -p                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li>\n","protected":false},"excerpt":{"rendered":"<p>git \u5982\u4f55\u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u662f\u4ec0\u4e48\u65f6\u5019&hellip;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/152393"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=152393"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/152393\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=152393"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=152393"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=152393"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}