git add --intent-to-add and git stash

[Jonathan Müller <jonathanmueller.dev@xxxxxxxxx>]

Hello,

when I try to `git stash` a file I have previously added using `git add 
--intent-to-add`, I get an `error: Entry 'X' not uptodate. Cannot 
merge.` error. I have to manually remove the file from the index, stash, 
and add it again after I've popped the stash.

Can `git stash` be taught to handle such files automatically?

Thanks,
Jonathan