You might have noticed that git is not that much about “pretty-looking” and “intuitive interface”. You did guess the answer and the proper git way: just think of fixed as bad and not fixed as good.
Since this perfectly handles your (less common) case apart from being a little bit ugly, there does not need to be special support for it in git, and you can assume that there never will.
Edit: I was wrong. Git added support for this in version 2.7 – see this answer.