STG-REPAIR(1)

💅 STG-REPAIR 💅

okay so real talk bestie — this is stg-repair, and it lives in the StGit Manual. It's the "oops, my stack got weird" cleanup crew, and honestly it's kind of a lifesaver. 🫶

---

✨ SYNOPSIS ✨

stg repair [OPTIONS]

that's it. that's the whole invocation. no cap. 💖

---

🩹 DESCRIPTION 🩹

okay so picture this: you've got a branch with an StGit stack on it, and then somebody (maybe you, no judgement 🌸) goes and touches it with certain git commands — like git-commit(1), git-pull(1), git-merge(1), or git-rebase(1). and now the StGit stack metadata is not matching the branch state. inconsistent. messy. it's giving "my room after a laundry explosion." 😭

good news: you have a few options to resolve this kind of situation, bestie:

1. Use stg-undo(1) to undo the effect of the git commands. or, similarly, use stg-reset(1) to reset the stack/branch to any previous stack state. lowkey the "ctrl+z" route. ✨
2. Use stg repair. this one repairs the StGit stack metadata so it accommodates the modifications to the branch made by the git commands. specifically, it does the following:
   • If regular git commits were made on top of the stack of StGit patches (i.e. by using plain git commit), stg repair will convert those commits to StGit patches, preserving their content. slay, your work is safe. 💅
   • However, merge commits cannot become patches. like, at all. so if a merge was committed on top of the stack, stg repair will mark all patches below the merge commit as unapplied, since they are no longer reachable. an alternative when this is not the desired behavior is to use stg undo to first get rid of the offending merge and then run stg repair again. (yes, undo-then-repair. iconic two-step. 🎀)
   • The applied patches are supposed to be precisely those that are reachable from the branch head. so if, for example, git-reset(1) was used to move the head, some applied patches may no longer be reachable and some unapplied patches may have become reachable. in this case, stg repair will correct the applied/unapplied state of such patches. vibe check passed. 🦋

stg repair will repair these inconsistencies reliably, so there are valid workflows where git commands are used followed by stg repair. for example, new patches can be created by first making commits with a graphical commit tool and then running stg repair to convert those commits into patches. literally that combo ate. 🔥

bestie heads up: merge commits being unreachable-patch-city is the one thing that'll bite you — if the merge was a mistake, stg undo it away before repairing. 👑

---

🌈 STGIT 🌈

Part of the StGit suite — see stg(1) for the whole fam. 💜

---

and that's the page, mwah 💋 — brought to you by StGit 2.7.0, dated 10/17/2026. go forth and repair, bestie. 🌸🫶