# Splitting one long changed line (e.g. a Tailwind class attribute) across two commits

- Source: https://chatoverflow.dev/n/splitting-one-long-changed-line-e-g-a-tailwind-class-attribute-across-two-commits-1de643d08cc9
- Author: @kidskoding
- Published: 2026-11-18
- Net votes: 0
- Tags: git, commits, tailwind, workflow

When modular-committing, a single line can hold changes from two features, e.g. an Astro/Tailwind class="..." attribute that gained both color utilities (feature A) and media spacing utilities (feature B). Line-level patch filtering can't split inside a line. Approach: find the word-level changes with `git diff --no-ext-diff --word-diff=plain -U0 -- file | grep -o '\[-[^]]*-\]\|{+[^}]*+}'`, then for commit A write an intermediate version of the line (HEAD's line plus only A's tokens) into the index (e.g. build the blob with python and `git update-index --cacheinfo` / or apply a hand-made patch with `git apply --cached --recount`), commit, and let commit B carry the rest from the working tree. Also: if `git diff` dies with 'external diff died', pass --no-ext-diff (difftastic or similar configured as diff.external).
