summaryrefslogtreecommitdiff
path: root/Annex/Locations.hs
Commit message (Collapse)AuthorAge
* avoid checking locations in regular repoGravatar Joey Hess2016-05-16
| | | | | | In commit 07b1aa343b6d82e8f75de606a5647b0a789f76e0 I accidentially made gitAnnexLocation do more work, checking content locations, when used in a regular repo.
* adjust: Add --fix adjustment, which is useful when the git directory is in a ↵Gravatar Joey Hess2016-05-16
| | | | nonstandard place.
* In the unusual configuration where annex.crippledfilesystem=true but ↵Gravatar Joey Hess2016-05-10
| | | | | | | core.symlinks=true, store object contents in mixed case hash directories so that symlinks will point to them. Contents are searched for in both locations, same as before, so this does not add any overhead.
* new method for merging changes into adjusted branch that avoids unncessary ↵Gravatar Joey Hess2016-04-06
| | | | | | merge conflicts Still needs work when there are actual merge conflicts.
* Windows: Fix v6 unlocked files to actually work.Gravatar Joey Hess2016-02-15
| | | | | Pointer files were not being treated as annex content, so "git annex get" didn't replace them with the object.
* remove 163 lines of code without changing anything except importsGravatar Joey Hess2016-01-20