Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | add git-union-merge | 2011-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. | ||
* | thought | 2011-06-20 | |
| | |||
* | update | 2011-06-20 | |
| | |||
* | update | 2011-06-20 | |
| | |||
* | pointless golfing | 2011-06-20 | |
| | |||
* | (no commit message) | 2011-06-20 | |
| | |||
* | Comment moderation | 2011-06-20 | |
| | |||
* | git is slow | 2011-06-14 | |
| | |||
* | minor bug report | 2011-06-14 | |
| | |||
* | Allow --trust etc to specify a repository by name, for temporarily trusting ↵ | 2011-06-13 | |
| | | | | repositories that are not configured remotes. | ||
* | fix test suite | 2011-06-13 | |
| | |||
* | bigfix: stat parent dirs | 2011-06-13 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2011-06-13 | |
|\ | |||
* | | rsync is now used when copying files from repos on other filesystems | 2011-06-13 | |
| | | | | | | | | | | | | | | | | | | cp is still used when copying file from repos on the same filesystem, since --reflink=auto can make it significantly faster on filesystems such as btrfs. Directory special remotes still use cp, not rsync. It's not clear what tmp file should be used when rsyncing to such a remote. | ||
| * | (no commit message) | 2011-06-13 | |
|/ | |||
* | response | 2011-06-13 | |
| | |||
* | Added a comment | 2011-06-13 | |
| | |||
* | (no commit message) | 2011-06-13 | |
| | |||
* | (no commit message) | 2011-06-13 | |
| | |||
* | Added a comment: short answer: no | 2011-06-10 | |
| | |||
* | Added a comment: Any chance to get git-annex going on windows? | 2011-06-10 | |
| | |||
* | Added a comment | 2011-06-10 | |
| | |||
* | Added a comment | 2011-06-10 | |
| | |||
* | Comment moderation | 2011-06-10 | |
| | |||
* | S3 stub bug got fixed | 2011-06-10 | |
| | |||
* | fix building with S3 stub | 2011-06-10 | |
| | |||
* | add news item for git-annex 0.20110610 | 2011-06-10 | |
| | |||
* | releasing version 0.201106100.20110610 | 2011-06-10 | |
| | |||
* | Bugfix: Fix fsck to not think all SHAnE keys are bad. | 2011-06-10 | |
| | |||
* | get --from is the same as copy --from | 2011-06-09 | |
| | | | | | | | | get not honoring --from has surprised me a few times, so least surprise suggests it should just behave like copy --from. This leaves the difference between get and copy being that copy always requires the remote to copy from, while get will decide whether to get a file from a key/value store or a remote. | ||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2011-06-09 | |
|\ | |||
| * | Added a comment | 2011-06-08 | |
| | | |||
| * | (no commit message) | 2011-06-08 | |
| | | |||
| * | (no commit message) | 2011-06-04 | |
| | | |||
| * | Added a comment: git annex unused | 2011-06-02 | |
| | | |||
| * | Added a comment: git annex unused | 2011-06-02 | |
| | | |||
| * | Added a comment: git annex unlock --readonly | 2011-06-02 | |
| | | |||
* | | tweak | 2011-06-02 | |
| | | |||
* | | refactor | 2011-06-02 | |
|/ | |||
* | update | 2011-06-02 | |
| | |||
* | fix | 2011-06-02 | |
| | |||
* | reformat | 2011-06-02 | |
| | |||
* | update | 2011-06-02 | |
| | |||
* | update | 2011-06-02 | |
| | |||
* | adjust to use primary git repo | 2011-06-02 | |
| | |||
* | add fedora install instructions | 2011-06-02 | |
| | |||
* | rename modules for data types into Types/ directory | 2011-06-01 | |
| | |||
* | better types allowed breaking module dep loop | 2011-06-01 | |
| | |||
* | (no commit message) | 2011-06-01 | |
| | |||
* | Add --trust, --untrust, and --semitrust options. | 2011-06-01 | |
| |