{"id":37597,"date":"2023-01-25T04:36:01","date_gmt":"2023-05-12T16:20:19","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/"},"modified":"2024-04-29T11:22:49","modified_gmt":"2024-04-29T03:22:49","slug":"git%e7%ac%94%e8%ae%b0-16","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/","title":{"rendered":"GIT\u7b14\u8bb0"},"content":{"rendered":"<h3>\u6574\u7406\u63d0\u4ea4 git rebase -i \u6216\u8005 git commit &#8211;amend<\/h3>\n<p>\u5f53\u9700\u8981\u5220\u9664\u6216\u4fee\u6b63\u4e0d\u5fc5\u8981\u7684\u63d0\u4ea4\u65f6\uff0c\u4f8b\u5982\u6dfb\u52a0\u9057\u6f0f\u7684\u6587\u4ef6\u4e4b\u7c7b\u7684\u63d0\u4ea4\u3002<\/p>\n<pre class=\"post-pre\"><code># 1\u3064\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u66f8\u304d\u63db\u3048\u308b\u65b9\u6cd5\r\n$ git commit --amend -m \"\u66f8\u304d\u63db\u3048\u305f\u3044\u30e1\u30c3\u30bb\u30fc\u30b8\"\r\n# \u66f8\u304d\u63db\u3048\u306a\u3044\u3067\u8ffd\u52a0\u3059\u308b\u65b9\u6cd5\r\n# git add \u8ffd\u52a0\u3057\u305f\u3044\u30d5\u30a1\u30a4\u30eb\r\n# git commit --amend --no-edit\r\n\r\n# \u305d\u308c\u4ee5\u5916\u306e\u30b3\u30df\u30c3\u30c8\u3092\u66f8\u304d\u63db\u3048\u308b\u65b9\u6cd5\u3002\uff08\u3082\u3061\u308d\u3093\u76f4\u524d\u3082\u53ef\uff09\r\n$ git rebase -i \u30b3\u30df\u30c3\u30c8ID\r\n# \u3059\u308b\u3068\u30a8\u30c7\u30a3\u30bf\u304c\u8d77\u52d5\r\n  pick\u3068\u66f8\u3044\u3066\u3042\u308b\u3068\u3053\u308d\u3092edit\u3084drop\u306a\u3069\u30b3\u30de\u30f3\u30c9\u306e\u8aac\u660e\u306b\u66f8\u3044\u3066\u3042\u308b\u3088\u3046\u306b\u7de8\u96c6\u3057\u3001\u4fdd\u5b58\u3002`:wq`\r\n\r\n-----\u30b3\u30de\u30f3\u30c9\u4e00\u89a7\u306b\u5f93\u3046\u2193\r\n# Commands:\r\n#  p, pick = use commit\r\n#  r, reword = use commit, but edit the commit message\r\n#  e, edit = use commit, but stop for amending\r\n#  s, squash = use commit, but meld into previous commit\r\n#  f, fixup = like \"squash\", but discard this commit's log message\r\n#  x, exec = run command (the rest of the line) using shell\r\n#\r\n# These lines can be re-ordered; they are executed from top to bottom.\r\n-----\r\n\u2192 edit\u3068\u3057\u305f\u5834\u5408\u3001\u307e\u305f\u7de8\u96c6\u306e\u30a8\u30c7\u30a3\u30bf\u304c\u8d77\u52d5\u3057\u3001\u30b3\u30df\u30c3\u30c8\u306e\u5185\u5bb9\u3092\u66f8\u304d\u63db\u3048\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u3002\r\n\r\n<\/code><\/pre>\n<h3>\u5982\u679c\u6709\u4eba\u5220\u9664\u4e86\u8fdc\u7a0b\u5206\u652f<\/h3>\n<pre class=\"post-pre\"><code>#\u30ea\u30e2\u30fc\u30c8\u4e0a\u306e\u524a\u9664\u3055\u308c\u305f\u30d6\u30e9\u30f3\u30c1\u304c\u3042\u308b\u304b\u3069\u3046\u304b\u78ba\u8a8d\r\n$ git remote show origin\r\n#\u30ea\u30e2\u30fc\u30c8\u4e0a\u306e\u524a\u9664\u3055\u308c\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u30ed\u30fc\u30ab\u30eb\u304b\u3089\u6d88\u3059\r\n$ git fetch --prune\r\n\u53c8\u306f\r\n$ git pull --prune\r\n<\/code><\/pre>\n<ul class=\"post-ul\">\u4e0a\u8a18\u304c\u3081\u3093\u3069\u304f\u3055\u3044\u5834\u5408git config\u306b\u8a2d\u5b9a<\/ul>\n<pre class=\"post-pre\"><code>#\u30b0\u30ed\u30fc\u30d0\u30eb\u306b\u8a2d\u5b9a\u3002--prune\u4ed8\u304d\u3067fetch\u3068pull\u304c\u5b9f\u884c\u3055\u308c\u308b\u3088\u3046\u306b\u306a\u308b\u3002\r\n$ git config --global fetch.prune true\r\n$ git fetch\r\n<\/code><\/pre>\n<h3>\u5bfb\u627e\u7f6a\u72af<\/h3>\n<p>\u901a\u8fc7\u4f7f\u7528git blame\u547d\u4ee4\uff0c\u53ef\u4ee5\u5f97\u77e5\u6bcf\u884c\u4ee3\u7801\u88ab\u6700\u540e\u4e00\u6b21\u4fee\u6539\u7684\u63d0\u4ea4\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git blame \u30d5\u30a1\u30a4\u30eb\u540d\r\n\r\n# \u30a4\u30f3\u30c7\u30f3\u30c8\u30b3\u30df\u30c3\u30c8\u3092\u7121\u8996\r\n$ git blame -w \r\n\r\n# \u4ed6\r\n# `-L` \u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u884c\u6570\u3092\u6307\u5b9a\u3067\u304d\u308b\r\n<\/code><\/pre>\n<h3>\u4e0d\u63d0\u4ea4\u53d8\u66f4\u800c\u5c06\u5176\u6682\u5b58<\/h3>\n<pre class=\"post-pre\"><code># save\u306f\u306a\u304f\u3066\u3082OK\r\n$ git stash save\r\n# \u65b0\u898f\u30d5\u30a1\u30a4\u30eb\u3082\u542b\u3081\u3066\u4fdd\u5b58\r\n$ git stash -u\r\n\r\n# \u4fdd\u5b58\u3057\u305f\u3082\u306e\u3092\u78ba\u8a8d\r\n$ git stash list\r\nstash@{X}\u304cstash\u306e\u540d\u524d\u3002WIP on\u306e\u3042\u3068\u306f\u30d6\u30e9\u30f3\u30c1\u540d\r\n\r\n# \u623b\u3059\r\n$ git stash apply stash@{0}\r\nstash\u540d\u3092\u6307\u5b9a\u3057\u306a\u3044\u5834\u5408\u306f\u3001\u76f4\u8fd1\u306b\u9000\u907f\u3055\u308c\u305f\u5909\u66f4\u3092\u623b\u3059\r\n# ADD\u3055\u308c\u305f\u72b6\u614b\u3067\u623b\u3059\u5834\u5408\u306findex\u3092\u3064\u3051\u308b\r\n$ git stash apply stash@{0} --index\r\n\r\n# \u524a\u9664\u3059\u308b\r\n$ git stash drop stash@{0}\r\n# \u3059\u3079\u3066\u524a\u9664\u3059\u308b\r\n$git stash clear\r\n\r\n# \u623b\u3059\uff06\u524a\u9664\u306fpop\u3002\u3089\u304f\u3061\u3093\r\n$ git stash pop stash@{0}\r\n<\/code><\/pre>\n<h2>\u4e00\u7bc7\u80fd\u589e\u8fdb\u5bf9Git\u7406\u89e3\u7684\u6587\u7ae0<\/h2>\n<p>\u5c3d\u53ef\u80fd\u51c6\u786e\u5730\u7406\u89e3Git\u4ed3\u5e93\u7684\u5185\u5bb9<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u6574\u7406\u63d0\u4ea4 git rebase -i \u6216\u8005 git commit &#8211;amend \u5f53\u9700\u8981\u5220\u9664\u6216\u4fee\u6b63\u4e0d [&hellip;]<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37597","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\u7b14\u8bb0 - 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\u7b14\u8bb0-16\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"GIT\u7b14\u8bb0\" \/>\n<meta property=\"og:description\" content=\"\u6574\u7406\u63d0\u4ea4 git rebase -i \u6216\u8005 git commit &#8211;amend \u5f53\u9700\u8981\u5220\u9664\u6216\u4fee\u6b63\u4e0d [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7b14\u8bb0-16\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-05-12T16:20:19+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T03:22:49+00:00\" \/>\n<meta name=\"author\" content=\"\u97f5, \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=\"\u97f5, \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%ac%94%e8%ae%b0-16\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/\",\"name\":\"GIT\u7b14\u8bb0 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-05-12T16:20:19+00:00\",\"dateModified\":\"2024-04-29T03:22:49+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"GIT\u7b14\u8bb0\"}]},{\"@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\/6530331a63adef3b3443a1fab53a0e6e\",\"name\":\"\u97f5, \u79d1\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g\",\"caption\":\"\u97f5, \u79d1\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunke\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"GIT\u7b14\u8bb0 - 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\u7b14\u8bb0-16\/","og_locale":"zh_CN","og_type":"article","og_title":"GIT\u7b14\u8bb0","og_description":"\u6574\u7406\u63d0\u4ea4 git rebase -i \u6216\u8005 git commit &#8211;amend \u5f53\u9700\u8981\u5220\u9664\u6216\u4fee\u6b63\u4e0d [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7b14\u8bb0-16\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-05-12T16:20:19+00:00","article_modified_time":"2024-04-29T03:22:49+00:00","author":"\u97f5, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u97f5, \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%ac%94%e8%ae%b0-16\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/","name":"GIT\u7b14\u8bb0 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-05-12T16:20:19+00:00","dateModified":"2024-04-29T03:22:49+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"GIT\u7b14\u8bb0"}]},{"@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\/6530331a63adef3b3443a1fab53a0e6e","name":"\u97f5, \u79d1","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g","caption":"\u97f5, \u79d1"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunke\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%ac%94%e8%ae%b0-16\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37597","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\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37597"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37597\/revisions"}],"predecessor-version":[{"id":84975,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37597\/revisions\/84975"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37597"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37597"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37597"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}