[{"data":1,"prerenderedAt":211},["ShallowReactive",2],{"wiki-page-\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti":3,"wiki-doc-items-\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti":175,"language-switcher-data-\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti":195,"wiki-i18n-paths-\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti":210},{"id":4,"title":5,"body":6,"canonicalPath":156,"chapterDepth":157,"chapterOrder":158,"date":159,"description":25,"docI18nKey":160,"docKey":161,"docRoot":162,"docTitle":163,"extension":164,"i18nKey":165,"isBlogPost":166,"isWikiDoc":35,"isWikiIndex":166,"layout":167,"legacyPath":167,"locale":168,"localeSlug":169,"meta":170,"navigation":35,"path":156,"seo":171,"sourcePath":172,"sourceStem":165,"stem":173,"wikiDepth":32,"__hash__":174},"content\u002F_i18n\u002Fen-us\u002Fwiki\u002F2023-12-29-Git教学\u002F0400-常见问题.md","Frequently Asked Questions",{"type":7,"value":8,"toc":152},"minimark",[9,19,95,99,105,108,145,148],[10,11,13,14,18],"h3",{"id":12},"if-you-want-to-cancel-a-commit-that-was-made-locally-you-can-use-git-reset-to-undo-it","If you want to cancel a commit that was made locally, you can use ",[15,16,17],"code",{},"git reset"," to undo it.",[20,21,26],"pre",{"className":22,"code":23,"language":24,"meta":25,"style":25},"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","",[15,27,28,37,44,62,67,73],{"__ignoreMap":25},[29,30,33],"span",{"class":31,"line":32},"line",1,[29,34,36],{"emptyLinePlaceholder":35},true,"\n",[29,38,40],{"class":31,"line":39},2,[29,41,43],{"class":42},"sJ8bj","# 设置默认编辑器\n",[29,45,47,51,55,59],{"class":31,"line":46},3,[29,48,50],{"class":49},"sVt8B","git config ",[29,52,54],{"class":53},"s7hpK","--",[29,56,58],{"class":57},"szBVR","global",[29,60,61],{"class":49}," core.editor vim\n",[29,63,65],{"class":31,"line":64},4,[29,66,36],{"emptyLinePlaceholder":35},[29,68,70],{"class":31,"line":69},5,[29,71,72],{"class":42},"# 使用交互式rebase\n",[29,74,76,79,82,85,89,92],{"class":31,"line":75},6,[29,77,78],{"class":49},"git rebase ",[29,80,81],{"class":57},"-",[29,83,84],{"class":49},"i ",[29,86,88],{"class":87},"sj4cs","HEAD",[29,90,91],{"class":57},"~",[29,93,94],{"class":87},"2\n",[96,97,98],"p",{},"If I don't want to submit \"add bishe\" anymore.",[96,100,101],{},[102,103],"img",{"alt":25,"src":104},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage89.webp",[96,106,107],{},"You can modify the image above to:",[20,109,111],{"className":22,"code":110,"language":24,"meta":25,"style":25},"drop \u003Chash1> add bishe\npick \u003Chash2> update\n",[15,112,113,130],{"__ignoreMap":25},[29,114,115,118,121,124,127],{"class":31,"line":32},[29,116,117],{"class":49},"drop ",[29,119,120],{"class":57},"\u003C",[29,122,123],{"class":49},"hash1",[29,125,126],{"class":57},">",[29,128,129],{"class":49}," add bishe\n",[29,131,132,135,137,140,142],{"class":31,"line":39},[29,133,134],{"class":49},"pick ",[29,136,120],{"class":57},[29,138,139],{"class":49},"hash2",[29,141,126],{"class":57},[29,143,144],{"class":49}," update\n",[96,146,147],{},"Then exit the editor and it's done.",[149,150,151],"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":25,"searchDepth":39,"depth":39,"links":153},[154],{"id":12,"depth":46,"text":155},"If you want to cancel a commit that was made locally, you can use git reset to undo it.","\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti",0,"0400","2023-12-29","wiki\u002F2023-12-29-git-jiao-xue","en-us:2023-12-29-git-jiao-xue","\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue","Git教学","md","wiki\u002F2023-12-29-Git教学\u002F0400-常见问题",false,null,"en-US","en-us",{},{"title":5,"description":25},"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti","_i18n\u002Fen-us\u002Fwiki\u002F2023-12-29-Git教学\u002F0400-常见问题","77yeelCpPyXIdkfYu0fmzgGCwBWP2IoUowaEj5EwYVk",[176,181,186,191,192],{"path":177,"stem":178,"title":179,"date":159,"chapterOrder":180,"chapterDepth":157,"docKey":161,"docRoot":162,"docTitle":163,"isWikiDoc":35,"isWikiIndex":166},"\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0100-git-jian-jie","_i18n\u002Fen-us\u002Fwiki\u002F2023-12-29-Git教学\u002F0100-Git简介","Introduction to Git","0100",{"path":182,"stem":183,"title":184,"date":159,"chapterOrder":185,"chapterDepth":157,"docKey":161,"docRoot":162,"docTitle":163,"isWikiDoc":35,"isWikiIndex":166},"\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao","_i18n\u002Fen-us\u002Fwiki\u002F2023-12-29-Git教学\u002F0200-Git实操","Git in Practice","0200",{"path":187,"stem":188,"title":189,"date":159,"chapterOrder":190,"chapterDepth":157,"docKey":161,"docRoot":162,"docTitle":163,"isWikiDoc":35,"isWikiIndex":166},"\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0300-gao-ji-gong-ju","_i18n\u002Fen-us\u002Fwiki\u002F2023-12-29-Git教学\u002F0300-高级工具","Advanced Tools","0300",{"path":156,"stem":173,"title":5,"date":159,"chapterOrder":158,"chapterDepth":157,"docKey":161,"docRoot":162,"docTitle":163,"isWikiDoc":35,"isWikiIndex":166},{"path":162,"stem":193,"title":194,"date":159,"chapterOrder":167,"chapterDepth":157,"docKey":161,"docRoot":162,"docTitle":163,"isWikiDoc":35,"isWikiIndex":35},"_i18n\u002Fen-us\u002Fwiki\u002F2023-12-29-Git教学\u002Findex","Git tutorial",{"variants":196},[197,198,201,204,207],{"path":156,"localeSlug":169,"i18nKey":165},{"path":199,"localeSlug":200,"i18nKey":165},"\u002Fzh-hant\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti","zh-hant",{"path":202,"localeSlug":203,"i18nKey":165},"\u002Fzh-hk\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti","zh-hk",{"path":205,"localeSlug":206,"i18nKey":165},"\u002Fzh-tw\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti","zh-tw",{"path":208,"localeSlug":209,"i18nKey":165},"\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti","zh-cn",[156,172,199,172,202,172,205,172,208,172],1784646850572]