[{"data":1,"prerenderedAt":109},["ShallowReactive",2],{"post:remove-file-from-last-commit":3},{"id":4,"title":5,"body":6,"date":98,"description":12,"draft":99,"extension":100,"meta":101,"navigation":102,"path":103,"seo":104,"stem":105,"tags":106,"__hash__":108},"posts\u002Fposts\u002Fremove-file-from-last-commit.md","TIL: Remove File From Last Git Commit",{"type":7,"value":8,"toc":95},"minimark",[9,13,16,46,49,66,73,91],[10,11,12],"p",{},"Ach! I over-committed! (heh, heh, joke, joke.)",[10,14,15],{},"I made one big commit instead of two smaller ones. Here's how to fix that:",[17,18,23],"pre",{"className":19,"code":20,"language":21,"meta":22,"style":22},"language-bash shiki shiki-themes github-light github-dark","git reset --soft HEAD^\n","bash","",[24,25,26],"code",{"__ignoreMap":22},[27,28,31,35,39,43],"span",{"class":29,"line":30},"line",1,[27,32,34],{"class":33},"sScJk","git",[27,36,38],{"class":37},"sZZnC"," reset",[27,40,42],{"class":41},"sj4cs"," --soft",[27,44,45],{"class":37}," HEAD^\n",[10,47,48],{},"Now un-stage the file you accidentally committed:",[17,50,52],{"className":19,"code":51,"language":21,"meta":22,"style":22},"git reset HEAD MyFile\n",[24,53,54],{"__ignoreMap":22},[27,55,56,58,60,63],{"class":29,"line":30},[27,57,34],{"class":33},[27,59,38],{"class":37},[27,61,62],{"class":37}," HEAD",[27,64,65],{"class":37}," MyFile\n",[10,67,68,69,72],{},"Now re-commit. I forgot to do this, but you can even \"re-use the same commit message\" by using the ",[24,70,71],{},"-c"," flag.",[17,74,76],{"className":19,"code":75,"language":21,"meta":22,"style":22},"git commit -c ORIG_HEAD\n",[24,77,78],{"__ignoreMap":22},[27,79,80,82,85,88],{"class":29,"line":30},[27,81,34],{"class":33},[27,83,84],{"class":37}," commit",[27,86,87],{"class":41}," -c",[27,89,90],{"class":37}," ORIG_HEAD\n",[92,93,94],"style",{},"html pre.shiki code .sScJk, html code.shiki .sScJk{--shiki-default:#6F42C1;--shiki-dark:#B392F0}html pre.shiki code .sZZnC, html code.shiki .sZZnC{--shiki-default:#032F62;--shiki-dark:#9ECBFF}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":22,"searchDepth":96,"depth":96,"links":97},2,[],"2018-05-29T09:43:16-04:00",false,"md",{},true,"\u002Fposts\u002Fremove-file-from-last-commit",{"title":5,"description":12},"posts\u002Fremove-file-from-last-commit",[34,107],"til","bXl_e_0ht3Kh4DOLzNEghGiBJX9FRj-e-lVzirG5zkA",1790471528185]