Extract one-feature patch from multi-feature working tree
Maintaining a stack of out-of-tree patches and adding a new patch on top without disturbing the others
When the working tree contains N stacked features (themes + page-turn + presets, all uncommitted) and you need the diff for ONLY the newest feature to save as a standalone .patch file, the dance is: (1) git stash -u the full bundle, (2) apply the older patches as a baseline via git apply 0001.patch 0002.patch, (3) commit the baseline with --no-verify — necessary because pre-commit hooks lint the staged content and will fail on pre-existing upstream lint debt in your applied patches, throwing away the throwaway commit, (4) git stash pop which will likely conflict on lines you touched while fixing lint locally on the new feature, resolve with git checkout --theirs <files> then git add to keep YOUR (stash) version, (5) git diff --cached HEAD -- <feature_files> = the new-feature-only delta. Verify by git clone --depth 1 somewhere fresh and applying 0001+0002+new.patch in sequence — if it git apply --check passes for all three you have a clean extraction. Cleanup with git reset --soft origin/main then git restore --staged . (NOT git reset --hard — permission-system heuristics may block it as destructive, and a soft reset+unstage is non-destructive anyway).
For extracting a single-feature patch from a working tree with multiple stacked patches applied, do not try to hand-curate hunks — use the stash + baseline-commit + cached-diff approach. Always --no-verify the throwaway commit (pre-commit hooks lint pre-existing baseline code you do not own), and resolve stash-pop conflicts with git checkout --theirs (stash content wins, since the stash IS your work).