[{"data":1,"prerenderedAt":203},["ShallowReactive",2],{"wiki-page-\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti":3,"wiki-doc-items-2023-12-29-git-jiao-xue":165,"wiki:author-members":191},{"id":4,"title":5,"authors":6,"body":8,"chapterDepth":152,"chapterOrder":153,"date":154,"description":21,"docKey":155,"docRoot":156,"docTitle":157,"extension":158,"isWikiDoc":32,"isWikiIndex":159,"meta":160,"navigation":32,"path":161,"seo":162,"stem":163,"wikiDepth":29,"__hash__":164},"wiki\u002Fwiki\u002F2023-12-29-Git教学\u002F0400-常见问题.md","常见问题",[7],"董佳辉",{"type":9,"value":10,"toc":149},"minimark",[11,15,92,96,102,105,142,145],[12,13,14],"h3",{"id":14},"commit到本地的想直接取消",[16,17,22],"pre",{"className":18,"code":19,"language":20,"meta":21,"style":21},"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","",[23,24,25,34,41,59,64,70],"code",{"__ignoreMap":21},[26,27,30],"span",{"class":28,"line":29},"line",1,[26,31,33],{"emptyLinePlaceholder":32},true,"\n",[26,35,37],{"class":28,"line":36},2,[26,38,40],{"class":39},"sJ8bj","# 设置默认编辑器\n",[26,42,44,48,52,56],{"class":28,"line":43},3,[26,45,47],{"class":46},"sVt8B","git config ",[26,49,51],{"class":50},"s7hpK","--",[26,53,55],{"class":54},"szBVR","global",[26,57,58],{"class":46}," core.editor vim\n",[26,60,62],{"class":28,"line":61},4,[26,63,33],{"emptyLinePlaceholder":32},[26,65,67],{"class":28,"line":66},5,[26,68,69],{"class":39},"# 使用交互式rebase\n",[26,71,73,76,79,82,86,89],{"class":28,"line":72},6,[26,74,75],{"class":46},"git rebase ",[26,77,78],{"class":54},"-",[26,80,81],{"class":46},"i ",[26,83,85],{"class":84},"sj4cs","HEAD",[26,87,88],{"class":54},"~",[26,90,91],{"class":84},"2\n",[93,94,95],"p",{},"若我不想提交add bishe了",[93,97,98],{},[99,100],"img",{"alt":21,"src":101},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage89.webp",[93,103,104],{},"可以将上图修改为：",[16,106,108],{"className":18,"code":107,"language":20,"meta":21,"style":21},"drop \u003Chash1> add bishe\npick \u003Chash2> update\n",[23,109,110,127],{"__ignoreMap":21},[26,111,112,115,118,121,124],{"class":28,"line":29},[26,113,114],{"class":46},"drop ",[26,116,117],{"class":54},"\u003C",[26,119,120],{"class":46},"hash1",[26,122,123],{"class":54},">",[26,125,126],{"class":46}," add bishe\n",[26,128,129,132,134,137,139],{"class":28,"line":36},[26,130,131],{"class":46},"pick ",[26,133,117],{"class":54},[26,135,136],{"class":46},"hash2",[26,138,123],{"class":54},[26,140,141],{"class":46}," update\n",[93,143,144],{},"然后退出编辑器后就成功了。",[146,147,148],"style",{},"html pre.shiki code .sJ8bj, html code.shiki .sJ8bj{--shiki-default:#6A737D;--shiki-dark:#6A737D}html pre.shiki code .sVt8B, html code.shiki .sVt8B{--shiki-default:#24292E;--shiki-dark:#E1E4E8}html pre.shiki code .s7hpK, html code.shiki .s7hpK{--shiki-default:#B31D28;--shiki-default-font-style:italic;--shiki-dark:#FDAEB7;--shiki-dark-font-style:italic}html pre.shiki code .szBVR, html code.shiki .szBVR{--shiki-default:#D73A49;--shiki-dark:#F97583}html pre.shiki code .sj4cs, html code.shiki .sj4cs{--shiki-default:#005CC5;--shiki-dark:#79B8FF}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":21,"searchDepth":36,"depth":36,"links":150},[151],{"id":14,"depth":43,"text":14},0,"0400","2023-12-29","2023-12-29-git-jiao-xue","\u002Fwiki\u002F2023-12-29-git-jiao-xue","Git教学","md",false,{},"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti",{"title":5,"description":21},"wiki\u002F2023-12-29-Git教学\u002F0400-常见问题","E853PvESWr2b-6CRdM1WDnQwqKfDmkMbq1f-UwANhuw",[166,172,178,184,186],{"path":167,"stem":168,"title":169,"authors":170,"date":154,"chapterOrder":171,"chapterDepth":152,"docKey":155,"docRoot":156,"docTitle":157,"isWikiDoc":32,"isWikiIndex":159},"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0100-git-jian-jie","wiki\u002F2023-12-29-Git教学\u002F0100-Git简介","Git简介",[7],"0100",{"path":173,"stem":174,"title":175,"authors":176,"date":154,"chapterOrder":177,"chapterDepth":152,"docKey":155,"docRoot":156,"docTitle":157,"isWikiDoc":32,"isWikiIndex":159},"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao","wiki\u002F2023-12-29-Git教学\u002F0200-Git实操","Git实操",[7],"0200",{"path":179,"stem":180,"title":181,"authors":182,"date":154,"chapterOrder":183,"chapterDepth":152,"docKey":155,"docRoot":156,"docTitle":157,"isWikiDoc":32,"isWikiIndex":159},"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0300-gao-ji-gong-ju","wiki\u002F2023-12-29-Git教学\u002F0300-高级工具","高级工具",[7],"0300",{"path":161,"stem":163,"title":5,"authors":185,"date":154,"chapterOrder":153,"chapterDepth":152,"docKey":155,"docRoot":156,"docTitle":157,"isWikiDoc":32,"isWikiIndex":159},[7],{"path":156,"stem":187,"title":188,"authors":189,"date":154,"chapterOrder":190,"chapterDepth":152,"docKey":155,"docRoot":156,"docTitle":157,"isWikiDoc":32,"isWikiIndex":32},"wiki\u002F2023-12-29-Git教学\u002Findex","Git教程",[7],null,[192,194,197,200],{"name":7,"image":193},"\u002Fimages\u002Fmember_photo\u002F董佳辉.jpg",{"name":195,"image":196},"宫金良","\u002Fimages\u002Fmember_photo\u002F宫金良.jpg",{"name":198,"image":199},"巩丽","\u002Fimages\u002Fmember_photo\u002F巩丽.png",{"name":201,"image":202},"张彦斐","\u002Fimages\u002Fmember_photo\u002F张彦斐.jpg",1792431901033]