Yeah, they stay in the working set but files are marked for different commits. Ideally git could do it at the line level instead of by file.