[{"data":1,"prerenderedAt":158},["ShallowReactive",2],{"wiki-page-/zh-tw/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti":3,"wiki-doc-items-/zh-tw/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti":118,"language-switcher-data-/zh-tw/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti":142,"wiki-i18n-paths-/zh-tw/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti":157},{"id":4,"title":5,"body":6,"canonicalPath":99,"chapter":100,"chapterSort":101,"date":102,"description":19,"docI18nKey":103,"docKey":104,"docRoot":105,"docTitle":106,"extension":107,"i18nKey":108,"isBlogPost":109,"isWikiDoc":30,"isWikiIndex":109,"layout":110,"legacyPath":110,"locale":111,"localeSlug":112,"meta":113,"navigation":30,"path":99,"seo":114,"sourcePath":115,"sourceStem":108,"stem":116,"wikiDepth":27,"__hash__":117},"content/_i18n/zh-tw/wiki/2023-12-29-Git教学/ch4-常见问题.md","常見問題",{"type":7,"value":8,"toc":96},"minimark",[9,13,61,65,71,74,89,92],[10,11,12],"h3",{"id":12},"commit到本地的想直接取消",[14,15,20],"pre",{"className":16,"code":17,"language":18,"meta":19,"style":19},"language-Python shiki shiki-themes github-light github-dark","\n# 设置默认编辑器\ngit config --global core.editor vim\n\n# 使用交互式rebase\ngit rebase -i HEAD~2\n","Python","",[21,22,23,32,38,44,49,55],"code",{"__ignoreMap":19},[24,25,28],"span",{"class":26,"line":27},"line",1,[24,29,31],{"emptyLinePlaceholder":30},true,"\n",[24,33,35],{"class":26,"line":34},2,[24,36,37],{},"# 设置默认编辑器\n",[24,39,41],{"class":26,"line":40},3,[24,42,43],{},"git config --global core.editor vim\n",[24,45,47],{"class":26,"line":46},4,[24,48,31],{"emptyLinePlaceholder":30},[24,50,52],{"class":26,"line":51},5,[24,53,54],{},"# 使用交互式rebase\n",[24,56,58],{"class":26,"line":57},6,[24,59,60],{},"git rebase -i HEAD~2\n",[62,63,64],"p",{},"若我不想提交add bishe了",[62,66,67],{},[68,69],"img",{"alt":19,"src":70},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image89.webp",[62,72,73],{},"可以將上圖修改為：",[14,75,77],{"className":16,"code":76,"language":18,"meta":19,"style":19},"drop \u003Chash1> add bishe\npick \u003Chash2> update\n",[21,78,79,84],{"__ignoreMap":19},[24,80,81],{"class":26,"line":27},[24,82,83],{},"drop \u003Chash1> add bishe\n",[24,85,86],{"class":26,"line":34},[24,87,88],{},"pick \u003Chash2> update\n",[62,90,91],{},"然後退出編輯器後就成功了。",[93,94,95],"style",{},"html .default .shiki span {color: var(--shiki-default);background: var(--shiki-default-bg);font-style: var(--shiki-default-font-style);font-weight: var(--shiki-default-font-weight);text-decoration: var(--shiki-default-text-decoration);}html .shiki span {color: var(--shiki-default);background: var(--shiki-default-bg);font-style: var(--shiki-default-font-style);font-weight: var(--shiki-default-font-weight);text-decoration: var(--shiki-default-text-decoration);}html .dark .shiki span {color: var(--shiki-dark);background: var(--shiki-dark-bg);font-style: var(--shiki-dark-font-style);font-weight: var(--shiki-dark-font-weight);text-decoration: var(--shiki-dark-text-decoration);}html.dark .shiki span {color: var(--shiki-dark);background: var(--shiki-dark-bg);font-style: var(--shiki-dark-font-style);font-weight: var(--shiki-dark-font-weight);text-decoration: var(--shiki-dark-text-decoration);}",{"title":19,"searchDepth":34,"depth":34,"links":97},[98],{"id":12,"depth":40,"text":12},"/zh-tw/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti","4",4000000,"2023-12-29","wiki/2023-12-29-git-jiao-xue","zh-tw:2023-12-29-git-jiao-xue","/zh-tw/wiki/2023-12-29-git-jiao-xue","Git教学","md","wiki/2023-12-29-Git教学/ch4-常见问题",false,null,"zh-TW","zh-tw",{},{"title":5,"description":19},"/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti","_i18n/zh-tw/wiki/2023-12-29-Git教学/ch4-常见问题","VniGF7FocbI2oRKl8_-0of3Xm4n7UeNvLmcAzMWjhjE",[119,125,131,137,138],{"path":120,"stem":121,"title":122,"date":102,"chapter":123,"chapterSort":124,"docKey":104,"docRoot":105,"docTitle":106,"isWikiDoc":30,"isWikiIndex":109},"/zh-tw/wiki/2023-12-29-git-jiao-xue/ch1-git-jian-jie","_i18n/zh-tw/wiki/2023-12-29-Git教学/ch1-Git简介","Git簡介","1",1000000,{"path":126,"stem":127,"title":128,"date":102,"chapter":129,"chapterSort":130,"docKey":104,"docRoot":105,"docTitle":106,"isWikiDoc":30,"isWikiIndex":109},"/zh-tw/wiki/2023-12-29-git-jiao-xue/ch2-git-shi-cao","_i18n/zh-tw/wiki/2023-12-29-Git教学/ch2-Git实操","Git實操","2",2000000,{"path":132,"stem":133,"title":134,"date":102,"chapter":135,"chapterSort":136,"docKey":104,"docRoot":105,"docTitle":106,"isWikiDoc":30,"isWikiIndex":109},"/zh-tw/wiki/2023-12-29-git-jiao-xue/ch3-gao-ji-gong-ju","_i18n/zh-tw/wiki/2023-12-29-Git教学/ch3-高级工具","高級工具","3",3000000,{"path":99,"stem":116,"title":5,"date":102,"chapter":100,"chapterSort":101,"docKey":104,"docRoot":105,"docTitle":106,"isWikiDoc":30,"isWikiIndex":109},{"path":105,"stem":139,"title":140,"date":102,"chapter":110,"chapterSort":141,"docKey":104,"docRoot":105,"docTitle":106,"isWikiDoc":30,"isWikiIndex":30},"_i18n/zh-tw/wiki/2023-12-29-Git教学/index","Git教程",0,{"variants":143},[144,147,150,153,154],{"path":145,"localeSlug":146,"i18nKey":108},"/en-us/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti","en-us",{"path":148,"localeSlug":149,"i18nKey":108},"/zh-hant/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti","zh-hant",{"path":151,"localeSlug":152,"i18nKey":108},"/zh-hk/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti","zh-hk",{"path":99,"localeSlug":112,"i18nKey":108},{"path":155,"localeSlug":156,"i18nKey":108},"/zh-cn/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti","zh-cn",[145,115,148,115,151,115,99,115,155,115],1780671901226]