Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | In the unusual configuration where annex.crippledfilesystem=true but ↵ | Joey Hess | 2016-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 ↵ | Joey Hess | 2016-04-06 |
| | | | | | | merge conflicts Still needs work when there are actual merge conflicts. | ||
* | Windows: Fix v6 unlocked files to actually work. | Joey Hess | 2016-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 imports | Joey Hess | 2016-01-20 |