[{"data":1,"prerenderedAt":137},["ShallowReactive",2],{"wiki-page-/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti":3,"wiki-doc-items-/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti":113},{"id":4,"title":5,"body":6,"chapter":99,"chapterSort":100,"date":101,"description":19,"docKey":102,"docRoot":103,"docTitle":104,"extension":105,"isWikiDoc":30,"isWikiIndex":106,"layout":107,"meta":108,"navigation":30,"path":109,"seo":110,"stem":111,"wikiDepth":27,"__hash__":112},"content/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},"4",4000000,"2023-12-29","2023-12-29-git-jiao-xue","/wiki/2023-12-29-git-jiao-xue","Git教学","md",false,null,{},"/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti",{"title":5,"description":19},"wiki/2023-12-29-Git教学/ch4-常见问题","vbMewKyp7k83R2mIxWGY3yVLLp5RVtPLFPoFI7sC1aI",[114,120,126,132,133],{"path":115,"stem":116,"title":117,"date":101,"chapter":118,"chapterSort":119,"docKey":102,"docRoot":103,"docTitle":104,"isWikiDoc":30,"isWikiIndex":106},"/wiki/2023-12-29-git-jiao-xue/ch1-git-jian-jie","wiki/2023-12-29-Git教学/ch1-Git简介","Git简介","1",1000000,{"path":121,"stem":122,"title":123,"date":101,"chapter":124,"chapterSort":125,"docKey":102,"docRoot":103,"docTitle":104,"isWikiDoc":30,"isWikiIndex":106},"/wiki/2023-12-29-git-jiao-xue/ch2-git-shi-cao","wiki/2023-12-29-Git教学/ch2-Git实操","Git实操","2",2000000,{"path":127,"stem":128,"title":129,"date":101,"chapter":130,"chapterSort":131,"docKey":102,"docRoot":103,"docTitle":104,"isWikiDoc":30,"isWikiIndex":106},"/wiki/2023-12-29-git-jiao-xue/ch3-gao-ji-gong-ju","wiki/2023-12-29-Git教学/ch3-高级工具","高级工具","3",3000000,{"path":109,"stem":111,"title":5,"date":101,"chapter":99,"chapterSort":100,"docKey":102,"docRoot":103,"docTitle":104,"isWikiDoc":30,"isWikiIndex":106},{"path":103,"stem":134,"title":135,"date":101,"chapter":107,"chapterSort":136,"docKey":102,"docRoot":103,"docTitle":104,"isWikiDoc":30,"isWikiIndex":30},"wiki/2023-12-29-Git教学/index","Git教程",0,1778560328615]