{"id":6696,"date":"2012-07-19T23:03:44","date_gmt":"2012-07-19T15:03:44","guid":{"rendered":"http:\/\/ihower.tw\/blog\/?p=6696"},"modified":"2015-12-01T16:23:26","modified_gmt":"2015-12-01T08:23:26","slug":"git-%e6%95%99%e8%82%b2%e8%a8%93%e7%b7%b4%e8%aa%b2%e7%a8%8b%e6%8a%95%e5%bd%b1%e7%89%87-2012","status":"publish","type":"post","link":"https:\/\/ihower.tw\/blog\/6696-git-%e6%95%99%e8%82%b2%e8%a8%93%e7%b7%b4%e8%aa%b2%e7%a8%8b%e6%8a%95%e5%bd%b1%e7%89%87-2012","title":{"rendered":"Git \u6559\u80b2\u8a13\u7df4\u8ab2\u7a0b\u6295\u5f71\u7247"},"content":{"rendered":"<p>Update(7\/21): \u6211\u628a p117 <a href=\"\/blog\/archives\/6704\/\">rebase \u548c merge \u64cd\u4f5c\u7684\u793a\u7bc4<\/a> \u9304\u6210\u5f71\u7247\u5566 :)<\/p>\n<p>\u9019\u662f\u6700\u8fd1\u6e96\u5099\u7684 Git \u6559\u80b2\u8a13\u7df4\u8ab2\u7a0b\uff0c\u52a0\u4e0a live demo (\u4e00\u822c\u64cd\u4f5c\u3001merge\u3001reset\u3001rebase\u7b49\u7b49\u793a\u7bc4) \u6642\u9593\u5927\u6982\u662f\u4e09\u500b\u5c0f\u6642\u3002\u5176\u5167\u5bb9\u4e3b\u8981\u57fa\u65bc<a href=\"http:\/\/ihower.tw\/blog\/archives\/5391\/\">\u53bb\u5e74\u7684\u6f14\u8b1b<\/a>\uff0c\u65b0\u589e\u4e86Git\u5167\u90e8\u539f\u7406(p36~51)\u3001\u5206\u652f\u6a21\u5f0f(p143)\u548c\u66f4\u591a Tips(p168)\u5167\u5bb9\u7b49\u7b49\uff0c\u7e3d\u9801\u6578\u5f9e117\u6210\u9577\u5230198&#8230; XD<\/p>\n<p><iframe loading=\"lazy\" src=\"\/\/www.slideshare.net\/slideshow\/embed_code\/key\/dRslgohG2b6WHT\" width=\"595\" height=\"485\" frameborder=\"0\" marginwidth=\"0\" marginheight=\"0\" scrolling=\"no\" style=\"border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;\" allowfullscreen> <\/iframe><\/p>\n<div style=\"margin-bottom:5px\"> <strong> <a href=\"\/\/www.slideshare.net\/ihower\/git-tutorial-13695342\" title=\"Git Tutorial \u6559\u5b78\" target=\"_blank\">Git Tutorial \u6559\u5b78<\/a> <\/strong> from <strong><a href=\"\/\/www.slideshare.net\/ihower\" target=\"_blank\">Wen-Tien Chang<\/a><\/strong> <\/div>\n<p>\u518d\u6b21\u611f\u8b1d schacon \u516c\u958b\u7684 <a href=\"https:\/\/github.com\/schacon\/git-presentations\">OmniGraffle Diagrams<\/a> \u5716\u6a94\u8b93\u6211\u53ef\u4ee5\u6539\u4f86\u7528 :><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Update(7\/21): \u6211\u628a p117 rebase \u548c merge \u64cd\u4f5c\u7684\u793a\u7bc4 \u9304\u6210\u5f71\u7247\u5566 :) \u9019\u662f\u6700 &hellip; <\/p>\n<p class=\"link-more\"><a href=\"https:\/\/ihower.tw\/blog\/6696-git-%e6%95%99%e8%82%b2%e8%a8%93%e7%b7%b4%e8%aa%b2%e7%a8%8b%e6%8a%95%e5%bd%b1%e7%89%87-2012\" class=\"more-link\">\u95b1\u8b80\u5168\u6587<span class=\"screen-reader-text\">\u3008Git \u6559\u80b2\u8a13\u7df4\u8ab2\u7a0b\u6295\u5f71\u7247\u3009<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":false,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2}},"categories":[48],"tags":[],"class_list":["post-6696","post","type-post","status-publish","format-standard","hentry","category-git","entry"],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_shortlink":"https:\/\/wp.me\/p1q6tG-1K0","jetpack_sharing_enabled":true,"jetpack_likes_enabled":true,"_links":{"self":[{"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/posts\/6696","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/comments?post=6696"}],"version-history":[{"count":25,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/posts\/6696\/revisions"}],"predecessor-version":[{"id":8394,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/posts\/6696\/revisions\/8394"}],"wp:attachment":[{"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/media?parent=6696"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/categories?post=6696"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/tags?post=6696"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}