[{"data":1,"prerenderedAt":188},["ShallowReactive",2],{"wiki-page-\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002Fch4-chang-jian-wen-ti":3,"wiki-doc-items-2023-12-29-git-jiao-xue":163},{"id":4,"title":5,"body":6,"chapter":150,"chapterSort":151,"date":152,"description":19,"docKey":153,"docRoot":154,"docTitle":155,"extension":156,"isWikiDoc":30,"isWikiIndex":157,"meta":158,"navigation":30,"path":159,"seo":160,"stem":161,"wikiDepth":27,"__hash__":162},"wiki\u002Fwiki\u002F2023-12-29-Git教学\u002Fch4-常见问题.md","常见问题",{"type":7,"value":8,"toc":147},"minimark",[9,13,90,94,100,103,140,143],[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,39,57,62,68],"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,38],{"class":37},"sJ8bj","# 设置默认编辑器\n",[24,40,42,46,50,54],{"class":26,"line":41},3,[24,43,45],{"class":44},"sVt8B","git config ",[24,47,49],{"class":48},"s7hpK","--",[24,51,53],{"class":52},"szBVR","global",[24,55,56],{"class":44}," core.editor vim\n",[24,58,60],{"class":26,"line":59},4,[24,61,31],{"emptyLinePlaceholder":30},[24,63,65],{"class":26,"line":64},5,[24,66,67],{"class":37},"# 使用交互式rebase\n",[24,69,71,74,77,80,84,87],{"class":26,"line":70},6,[24,72,73],{"class":44},"git rebase ",[24,75,76],{"class":52},"-",[24,78,79],{"class":44},"i ",[24,81,83],{"class":82},"sj4cs","HEAD",[24,85,86],{"class":52},"~",[24,88,89],{"class":82},"2\n",[91,92,93],"p",{},"若我不想提交add bishe了",[91,95,96],{},[97,98],"img",{"alt":19,"src":99},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage89.webp",[91,101,102],{},"可以将上图修改为：",[14,104,106],{"className":16,"code":105,"language":18,"meta":19,"style":19},"drop \u003Chash1> add bishe\npick \u003Chash2> update\n",[21,107,108,125],{"__ignoreMap":19},[24,109,110,113,116,119,122],{"class":26,"line":27},[24,111,112],{"class":44},"drop ",[24,114,115],{"class":52},"\u003C",[24,117,118],{"class":44},"hash1",[24,120,121],{"class":52},">",[24,123,124],{"class":44}," add bishe\n",[24,126,127,130,132,135,137],{"class":26,"line":34},[24,128,129],{"class":44},"pick ",[24,131,115],{"class":52},[24,133,134],{"class":44},"hash2",[24,136,121],{"class":52},[24,138,139],{"class":44}," update\n",[91,141,142],{},"然后退出编辑器后就成功了。",[144,145,146],"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":19,"searchDepth":34,"depth":34,"links":148},[149],{"id":12,"depth":41,"text":12},"4",4000000,"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\u002Fch4-chang-jian-wen-ti",{"title":5,"description":19},"wiki\u002F2023-12-29-Git教学\u002Fch4-常见问题","uJ-kltio22bQBc6vglIJbD_tjIO6I0Yh26XvAg_mtH0",[164,170,176,182,183],{"path":165,"stem":166,"title":167,"date":152,"chapter":168,"chapterSort":169,"docKey":153,"docRoot":154,"docTitle":155,"isWikiDoc":30,"isWikiIndex":157},"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002Fch1-git-jian-jie","wiki\u002F2023-12-29-Git教学\u002Fch1-Git简介","Git简介","1",1000000,{"path":171,"stem":172,"title":173,"date":152,"chapter":174,"chapterSort":175,"docKey":153,"docRoot":154,"docTitle":155,"isWikiDoc":30,"isWikiIndex":157},"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002Fch2-git-shi-cao","wiki\u002F2023-12-29-Git教学\u002Fch2-Git实操","Git实操","2",2000000,{"path":177,"stem":178,"title":179,"date":152,"chapter":180,"chapterSort":181,"docKey":153,"docRoot":154,"docTitle":155,"isWikiDoc":30,"isWikiIndex":157},"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002Fch3-gao-ji-gong-ju","wiki\u002F2023-12-29-Git教学\u002Fch3-高级工具","高级工具","3",3000000,{"path":159,"stem":161,"title":5,"date":152,"chapter":150,"chapterSort":151,"docKey":153,"docRoot":154,"docTitle":155,"isWikiDoc":30,"isWikiIndex":157},{"path":154,"stem":184,"title":185,"date":152,"chapter":186,"chapterSort":187,"docKey":153,"docRoot":154,"docTitle":155,"isWikiDoc":30,"isWikiIndex":30},"wiki\u002F2023-12-29-Git教学\u002Findex","Git教程",null,0,1778666546388]