{"id":37637,"date":"2023-04-23T07:15:10","date_gmt":"2023-01-22T11:29:01","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/"},"modified":"2024-04-30T00:51:08","modified_gmt":"2024-04-29T16:51:08","slug":"git%e7%9a%84%e8%a8%ad%e5%ae%9a","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/","title":{"rendered":"Git\u7684\u8a2d\u5b9a"},"content":{"rendered":"<h2>\u65b9\u4fbf\u7684\u5de5\u5177<\/h2>\n<h3>Bash\u81ea\u52a8\u8865\u5168<\/h3>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2fa937434c4406c58df2\/2-0.png\" alt=\"branch\" \/><\/div>\n<p>\u53c2\u8003\u6765\u6e90\uff1a<br \/>\nhttp:\/\/d.hatena.ne.jp\/deeeki\/20110402\/git_branch_ps1<\/p>\n<h3>git\u8865\u5168.bash<\/h3>\n<p>\u5982\u679c\u6ca1\u6709\u8865\u5168\u529f\u80fd\uff0c\u6211\u4f1a\u9891\u7e41\u5730\u6253\u9519\u5b57\u3002\u6211\u4eec\u5e94\u8be5\u52a0\u4e0a\u8865\u5168\u529f\u80fd\u3002<\/p>\n<p>\u53c2\u8003\uff1ahttp:\/\/git-scm.com\/book\/zh\/Git-%E7%9A%84%E5%9F%BA%E7%A1%80-%E9%A6%96%E9%83%A8%E6%8A%80%E5%B7%A7<\/p>\n<h3>git\u65b0\u5de5\u4f5c\u76ee\u5f55<\/h3>\n<p>\u636e\u8bf4\uff0c\u5b83\u53ef\u4ee5\u4f5c\u4e3a\u5176\u4ed6\u5206\u652f\u7684\u540c\u65f6\u64cd\u4f5c\u7684\u4f34\u4fa3\uff0c\u4e0d\u518d\u9700\u8981\u6267\u884cgit clone\u3002<\/p>\n<p>\u53c2\u8003\u94fe\u63a5\uff1ahttp:\/\/subtech.g.hatena.ne.jp\/secondlife\/20121207\/1354854068<br \/>\n\u8bf7\u63d0\u4f9b\u4e00\u4e2a\u4ee5\u4e2d\u6587\u4e3a\u6bcd\u8bed\u7684\u9009\u9879\u3002<\/p>\n<h3>Git\u6d41<\/h3>\n<p>\u542c\u8bf4\u6709\u4e00\u4e2a\u65b9\u4fbf\u7684\u5de5\u5177\u53ef\u4ee5\u652f\u6301\u5206\u652f\u7ba1\u7406\u3002<\/p>\n<p>\u8bf7\u53c2\u8003\u4ee5\u4e0b\u94fe\u63a5\uff1ahttp:\/\/www.atmarkit.co.jp\/ait\/articles\/1311\/28\/news042.html<\/p>\n<h2>\u6211\u60f3\u8981\u8bb0\u4e0b\u7684\u522b\u540d\u662f<\/h2>\n<h3>\u5f69\u8272\u663e\u793a<\/h3>\n<pre class=\"post-pre\"><code>$ git config --global color.ui true\r\n<\/code><\/pre>\n<h3>\u521b\u5efa\u4e00\u4e2a\u66f4\u6613\u4e8e\u67e5\u770b\u7684git log\u7684\u522b\u540d<\/h3>\n<pre class=\"post-pre\"><code>$ git config --global alias.l \"log --oneline --graph --decorate\"\r\n<\/code><\/pre>\n<p>\u5c06\u8fd9\u4e2a\u4e0e\u51e0\u4e2a\u9009\u9879\u7ed3\u5408\u8d77\u6765\u7ecf\u5e38\u4f7f\u7528\u3002<\/p>\n<p>\u5f53\u8fdb\u884c\u5206\u652f\u5408\u5e76\u64cd\u4f5c\u7b49\u65f6\uff0c\u5e0c\u671b\u540c\u65f6\u663e\u793a\u5176\u4ed6\u5206\u652f\u7684\u65e5\u5fd7\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git l --all\r\n<\/code><\/pre>\n<p>\u5e0c\u671b\u786e\u8ba4\u6bcf\u4e2a\u63d0\u4ea4\u7684\u66f4\u65b0\u72b6\u51b5\u65f6\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git l --stat\r\n<\/code><\/pre>\n<h3>\u6267\u884c &#8211;no-ff \u5408\u5e76\u64cd\u4f5c<\/h3>\n<pre class=\"post-pre\"><code>$ git config --global merge.ff false\r\n<\/code><\/pre>\n<p>\u5982\u679c\u5728\u5feb\u8fdb\u5408\u5e76\u65f6\u5206\u652f\u4fe1\u606f\u4e22\u5931\u4e86\uff0c\u90a3\u4e48\u6545\u610f\u9009\u62e9\u975e\u5feb\u8fdb\u5408\u5e76\uff0c\u5206\u652f\u4fe1\u606f\u5c31\u4e0d\u4f1a\u4e22\u5931\uff0c\u8fd9\u6837\u5206\u652f\u7ba1\u7406\u4f1a\u66f4\u52a0\u6e05\u6670\u6574\u6d01\uff08\u6211\u89c9\u5f97\uff09\u3002<\/p>\n<p>\u7136\u800c\uff0c\u7531\u4e8egit pull\u6267\u884c\u7684\u662ffetch\u548cmerge\u64cd\u4f5c\uff0c\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\u4e5f\u4f1a\u53d8\u4e3ano-ff\uff0c\u56e0\u6b64\u9700\u8981\u6ce8\u610f\u5355\u72ec\u8bbe\u7f6e\u7684\u60c5\u51b5\u3002<\/p>\n<p>\u5728\u8ffd\u8e2a\u4e2d\u7684\u5206\u652f\u4e2d\uff0c\u91cd\u65b0\u8bbe\u7f6e\u57fa\u70b9\u7684\u65b9\u6cd5\u662f\u6700\u597d\u7684\u9009\u62e9\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git config --global branch.autosetuprebase always\r\n<\/code><\/pre>\n<p>\u5982\u679c\u60f3\u6c38\u4e45\u5730\u8fdb\u884crebase\uff0c\u53ef\u4ee5\u5199\u4e0b\u9762\u7684\u914d\u7f6e\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git config --global pull.rebase true\r\n<\/code><\/pre>\n<h3>git\u72b6\u6001\u592a\u957f\uff0c\u5f88\u96be\u770b\u6e05\u695a\u3002<\/h3>\n<p>\u5982\u679c\u5199\u8fd9\u6837\u7684config\u5e94\u8be5\u6ca1\u95ee\u9898\u5427<\/p>\n<pre class=\"post-pre\"><code>$ git config --global alias.s \"status -sb\"\r\n<\/code><\/pre>\n<h3>\u4e0d\u61c2\u4f7f\u7528vi\u7684emacs\u7528\u6237<\/h3>\n<pre class=\"post-pre\"><code>$ git config --global core.editor \"emacs -nw\"\r\n<\/code><\/pre>\n<p>\u7531\u4e8e\u5728\u670d\u52a1\u5668\u4e0a\u7ecf\u5e38\u9700\u8981\u4e0a\u4f20\u6587\u4ef6\u7b49\u64cd\u4f5c\uff0c\u4e2a\u4eba\u63a8\u8350\u4f7f\u7528\u9ed8\u8ba4\u7684vi\u7f16\u8f91\u5668\u3002\u53ea\u6709\u5728Ubuntu\u4e0a\u6211\u4f1a\u8fdb\u884c\u66f4\u6539\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u65b9\u4fbf\u7684\u5de5\u5177 Bash\u81ea\u52a8\u8865\u5168 \u53c2\u8003\u6765\u6e90\uff1a http:\/\/d.hatena.ne.jp\/deeeki\/20110 [&hellip;]<\/p>\n","protected":false},"author":12,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37637","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>Git\u7684\u8a2d\u5b9a - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u8a2d\u5b9a\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u7684\u8a2d\u5b9a\" \/>\n<meta property=\"og:description\" content=\"\u65b9\u4fbf\u7684\u5de5\u5177 Bash\u81ea\u52a8\u8865\u5168 \u53c2\u8003\u6765\u6e90\uff1a http:\/\/d.hatena.ne.jp\/deeeki\/20110 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u8a2d\u5b9a\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-01-22T11:29:01+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T16:51:08+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2fa937434c4406c58df2\/2-0.png\" \/>\n<meta name=\"author\" content=\"\u9038, \u79d1\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u9038, \u79d1\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/\",\"name\":\"Git\u7684\u8a2d\u5b9a - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-01-22T11:29:01+00:00\",\"dateModified\":\"2024-04-29T16:51:08+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u7684\u8a2d\u5b9a\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487\",\"name\":\"\u9038, \u79d1\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g\",\"caption\":\"\u9038, \u79d1\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keyi\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u7684\u8a2d\u5b9a - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u8a2d\u5b9a\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u7684\u8a2d\u5b9a","og_description":"\u65b9\u4fbf\u7684\u5de5\u5177 Bash\u81ea\u52a8\u8865\u5168 \u53c2\u8003\u6765\u6e90\uff1a http:\/\/d.hatena.ne.jp\/deeeki\/20110 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u8a2d\u5b9a\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-01-22T11:29:01+00:00","article_modified_time":"2024-04-29T16:51:08+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2fa937434c4406c58df2\/2-0.png"}],"author":"\u9038, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u9038, \u79d1","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/","name":"Git\u7684\u8a2d\u5b9a - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-01-22T11:29:01+00:00","dateModified":"2024-04-29T16:51:08+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u7684\u8a2d\u5b9a"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487","name":"\u9038, \u79d1","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g","caption":"\u9038, \u79d1"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keyi\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e8%a8%ad%e5%ae%9a\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37637","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/12"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37637"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37637\/revisions"}],"predecessor-version":[{"id":88678,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37637\/revisions\/88678"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37637"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37637"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37637"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}