{"id":6988,"date":"2014-12-15T13:34:43","date_gmt":"2014-12-15T05:34:43","guid":{"rendered":"http:\/\/jpuyy.com\/?p=6988"},"modified":"2015-11-27T21:11:26","modified_gmt":"2015-11-27T13:11:26","slug":"git-notes","status":"publish","type":"post","link":"https:\/\/jpuyy.com\/?p=6988","title":{"rendered":"git\u4f7f\u7528\u7b14\u8bb0"},"content":{"rendered":"<p>\u4ece\u53e6\u4e00\u4e2a\u5206\u652f\u62f7\u4e1c\u897f\uff0c\u5982\u5728 develop \u5206\u652f\u4e0b<\/p>\n<pre>git merge --ff-only master<\/pre>\n<p>\u5bf9\u4e8e\u5177\u4f53\u7684\u4e00\u53f0\u673a\u5668\uff0c\u5982\u679c\u901a\u8fc7 ssh \u64cd\u4f5c git\uff0c\u53ef\u4ee5\u5728 ~\/.ssh\/config \u4e2d\u6307\u5b9a key<\/p>\n<pre> Host github.com\r\n Hostname github.com\r\n IdentityFile ~\/.ssh\/id_rsa.github<\/pre>\n<p>\u67e5\u770b\u5f53\u524d\u4fee\u6539\u4e0eHEAD(\u5f53\u524d\u7248\u672c\u5e93\u5934\u6307\u9488)\u8fdb\u884c\u6bd4\u8f83<\/p>\n<pre>git diff HEAD<\/pre>\n<p>\u5982\u679c\u53ea\u663e\u793a\u4fee\u6539\u7684\u6587\u4ef6, \u4f7f\u7528<\/p>\n<pre>git diff --stat<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u4ece\u53e6\u4e00\u4e2a\u5206\u652f\u62f7\u4e1c\u897f\uff0c\u5982\u5728 develop \u5206\u652f\u4e0b git merge &#8211;ff-only master \u5bf9\u4e8e\u5177\u4f53\u7684\u4e00\u53f0\u673a\u5668\uff0c\u5982\u679c\u901a\u8fc7 ssh \u64cd\u4f5c git\uff0c\u53ef\u4ee5\u5728 ~\/.ssh\/config \u4e2d\u6307\u5b9a key Host github.com Hostname github.com IdentityFile ~\/.ssh\/id_rsa.github \u67e5\u770b\u5f53\u524d\u4fee\u6539\u4e0eHEAD(\u5f53\u524d\u7248\u672c\u5e93\u5934\u6307\u9488)\u8fdb\u884c\u6bd4\u8f83 git diff HEAD \u5982\u679c\u53ea\u663e\u793a\u4fee\u6539\u7684\u6587\u4ef6, \u4f7f\u7528 git diff &#8211;stat<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[7],"tags":[],"class_list":["post-6988","post","type-post","status-publish","format-standard","hentry","category-life"],"_links":{"self":[{"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/posts\/6988","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/users\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/jpuyy.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=6988"}],"version-history":[{"count":5,"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/posts\/6988\/revisions"}],"predecessor-version":[{"id":7619,"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/posts\/6988\/revisions\/7619"}],"wp:attachment":[{"href":"https:\/\/jpuyy.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=6988"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/jpuyy.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=6988"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/jpuyy.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=6988"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}