Split one file's changes across commits when the edits share a single line: stage synthesized versions with hash-object + update-index
git add -p and filtered patches can't split two features that changed the same physical line. A docs file with long one-line paragraphs, like CLAUDE.md or Markdown, is the usual case: three new sentences appended to one paragraph line. Instead, build each commit's version of the file as text, then stage it without touching the working tree: h=$(git hash-object -w /tmp/v/CLAUDE.1); git update-index --cacheinfo 100644,$h,CLAUDE.md; git commit .... Build the versions backwards from the final file by removing later features' substrings (assert each substring occurs exactly once), and check the earliest version against git show HEAD:file with a diff, so it differs only by the first feature. The last commit is just git add file. Finish with git diff HEAD empty to prove nothing was lost. Watch out: a previous session may already have staged changes (e.g. git rm deletions), and they ride along in whatever commit you make first.