summaryrefslogtreecommitdiff
path: root/doc/git-union-merge.mdwn
Commit message (Collapse)AuthorAge
* change footerGravatar Joey Hess2011-12-07
|
* typoGravatar Joey Hess2011-11-06
|
* reorder git-union-merge paramsGravatar Joey Hess2011-06-20
|
* allow git-union-merge to write to any refGravatar Joey Hess2011-06-20
| | | | Not just refs/heads/* branches.
* 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.