Merge pull request #3250 from ethomson/stash Stash workdir correctly when added in the index, modified in the workdir