2011-01-07 06:15:23 +00:00
|
|
|
*.hi
|
|
|
|
|
*.o
|
2010-11-10 14:52:59 +00:00
|
|
|
test
|
2010-11-18 17:30:42 +00:00
|
|
|
configure
|
2011-08-20 20:11:42 +00:00
|
|
|
Build/SysConfig.hs
|
2010-10-10 04:18:16 +00:00
|
|
|
git-annex
|
2010-12-30 20:52:24 +00: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 23:44:45 +00:00
|
|
|
git-union-merge
|
2010-10-19 19:59:40 +00:00
|
|
|
git-annex.1
|
2010-12-30 20:52:24 +00: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 23:44:45 +00:00
|
|
|
git-union-merge.1
|
2010-10-19 19:59:40 +00:00
|
|
|
doc/.ikiwiki
|
|
|
|
|
html
|
2011-01-05 01:05:31 +00:00
|
|
|
*.tix
|
|
|
|
|
.hpc
|
2011-03-15 03:00:23 +00:00
|
|
|
Touch.hs
|
2011-03-22 19:48:14 +00:00
|
|
|
StatFS.hs
|
2011-03-30 17:18:46 +00:00
|
|
|
Remote/S3.hs
|
2011-06-30 18:55:03 +00:00
|
|
|
dist
|