summaryrefslogtreecommitdiff
path: root/doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn
Commit message (Collapse)AuthorAge
* lock: Reset unlocked file to index, rather than to branch head.Gravatar Joey Hess2012-05-30
| | | | | | | | Resetting an unlocked file to the branch head failed if it had just been added, not committed, and unlocked, since the branch didbn't have it. The code was concerned about dropping any changes that might be staged in the index, but I cannot see why.
* bugGravatar Joey Hess2012-05-25