I suspect you already implicitly included it, but just to mention it: the hunks created by `--patch` commands can be split up further through `s`. But as you sa

I suspect you already implicitly included it, but just to mention it: the hunks created by `--patch` commands can be split up further through `s`. But as you said, this is sometimes not enough either (two changed, adjacent lines will remain atomic).