git-annex/.gitignore

*.hi
*.o
test
configure
Build/SysConfig.hs
git-annex
git-annex-shell
git-union-merge
git-annex.1
git-annex-shell.1
git-union-merge.1
doc/.ikiwiki
html
*.tix
.hpc
Utility/Touch.hs
Utility/StatFS.hs
dist
workaround ghc weirdness with -odir 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. 2011-01-07 02:15:23 -04:00			`*.hi`
			`*.o`
update 2010-11-10 10:52:59 -04:00			`test`
Add configure step to build process. * configure: Check to see if cp -a can be used. * configure: Check to see if cp --reflink=auto can be used. 2010-11-18 13:30:42 -04:00			`configure`
moved files around 2011-08-20 16:11:42 -04:00			`Build/SysConfig.hs`
add 2010-10-10 00:18:16 -04:00			`git-annex`
add git-annex-shell command This is not yet complete, as it does not allow starting rsync or scp. 2010-12-30 16:52:24 -04:00			`git-annex-shell`
add git-union-merge 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. 2011-06-20 19:44:45 -04:00			`git-union-merge`
update 2010-10-19 15:59:40 -04:00			`git-annex.1`
add git-annex-shell command This is not yet complete, as it does not allow starting rsync or scp. 2010-12-30 16:52:24 -04:00			`git-annex-shell.1`
add git-union-merge 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. 2011-06-20 19:44:45 -04:00			`git-union-merge.1`
update 2010-10-19 15:59:40 -04:00			`doc/.ikiwiki`
			`html`
add testcoverage target using hpc added a test for key read and show 2011-01-04 21:05:31 -04:00			`*.tix`
			`.hpc`
split groups of related functions out of Utility 2011-08-22 16:14:12 -04:00			`Utility/Touch.hs`
			`Utility/StatFS.hs`
cabal can now be used to build git-annex. 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. 2011-06-30 14:55:03 -04:00			`dist`