summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAge
* split groups of related functions out of UtilityGravatar Joey Hess2011-08-22
|
* moved files aroundGravatar Joey Hess2011-08-20
|
* cabal can now be used to build git-annex.Gravatar Joey Hess2011-06-30
| | | | | | This is substantially slower than using make, does not build or install documentation, does not run the test suite, and is not particularly recommended, but could be useful to some.
* add git-union-mergeGravatar Joey Hess2011-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | This is a new git subcommand, that does a generic union merge operation between two refs, storing the result in a branch. It operates efficiently without touching the working tree. It does need to write out a temporary index file, and may need to write out some other temp files as well. This could be useful for anything that stores data in a branch, and needs to merge changes into that branch without actually checking the branch out. Since conflict handling can't be done without a working copy, the merge type is always a union merge, which is fine for data stored in log format (as git-annex does), or in non-conflicting files (as pristine-tar does). This probably belongs in git proper, but it will live in git-annex for now. --- Plan is to move .git-annex/ to a git-annex branch, and use git-union-merge to handle merging changes when pulling from remotes. Some preliminary benchmarking using real .git-annex/ data indicates that it's quite fast, except for the "git add" call, which is as slow as "git add" tends to be with a big index.
* add Remote.DirectoryGravatar Joey Hess2011-03-30
|
* add StatFS.hsc, copied from xmobarGravatar Joey Hess2011-03-22
|
* symlink touching funGravatar Joey Hess2011-03-14
| | | | | | | When adding files to the annex, the symlinks pointing at the annexed content are made to have the same mtime as the original file. While git does not preserve that information, this allows a tool like metastore to be used with annexed files.
* workaround ghc weirdness with -odirGravatar Joey Hess2011-01-07
| | | | | | The option cause it to always build to build/Main.o, no matter what binary it was building. This caused extra work, and in some cases, could cause the wrong code to be put into the final binary.
* add testcoverage target using hpcGravatar Joey Hess2011-01-04
| | | | added a test for key read and show
* add git-annex-shell commandGravatar Joey Hess2010-12-30
| | | | This is not yet complete, as it does not allow starting rsync or scp.
* Add configure step to build process.Gravatar Joey Hess2010-11-18
| | | | | * configure: Check to see if cp -a can be used. * configure: Check to see if cp --reflink=auto can be used.
* updateGravatar Joey Hess2010-11-10
|
* updateGravatar Joey Hess2010-10-19
|
* build in subdirGravatar Joey Hess2010-10-14
|
* addGravatar Joey Hess2010-10-10