Unstage works and only unstages, doesn't restage. You can't restage because you don't know if the state of the document has changed while you were gone.
Merge from master