| Commit message (Collapse) | Author | Age |
|---|
| |
|
|
| |
Put build cruft in a subdir
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
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.
|
| |
|
|
| |
added a test for key read and show
|
| |
|
|
| |
This is not yet complete, as it does not allow starting rsync or scp.
|
| |
|
|
|
| |
* configure: Check to see if cp -a can be used.
* configure: Check to see if cp --reflink=auto can be used.
|
| | |
|
| | |
|
| | |
|
| |
|
Joey Hess