Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | lock index while making index-less commits | Joey Hess | 2016-03-03 |
| | | | | | Avoids race with another git commit at the same time adjusted branch is being updated. | ||
* | support for git-style lock files, on unix and windows | Joey Hess | 2016-03-03 |
| | |||
* | need to update master | Joey Hess | 2016-02-29 |
| | |||
* | remove debug | Joey Hess | 2016-02-29 |
| | |||
* | note a bug | Joey Hess | 2016-02-29 |
| | |||
* | update keys database when adjusting branches | Joey Hess | 2016-02-29 |
| | |||
* | implement updateAdjustedBranch | Joey Hess | 2016-02-29 |
| | |||
* | fix bug introduced in recent commit | Joey Hess | 2016-02-29 |
| | |||
* | update sync branch to the orig branch when in adjusted branch | Joey Hess | 2016-02-29 |
| | |||
* | make assistant aware of adjusted branches when merging | Joey Hess | 2016-02-29 |
| | |||
* | push original branch when on adjusted branch | Joey Hess | 2016-02-29 |
| | |||
* | make sync aware of adjusted branches | Joey Hess | 2016-02-29 |
| | | | | | | | | | | So, it will pull and push the original branch, not the adjusted one. And, for merging, it will use updateAdjustedBranch (not implemented yet). Note that remaining uses of Git.Branch.current need to be checked too; for things that should act on the original branch, and not the adjusted branch. | ||
* | include adjustment in the adjusted branch name | Joey Hess | 2016-02-29 |
| | | | | Allows it to be recovered easily. | ||
* | Merge branch 'master' into adjustedbranch | Joey Hess | 2016-02-29 |
|\ | |||
| * | metadata: Added -r to remove all current values of a field. | Joey Hess | 2016-02-29 |
| | | |||
| * | use DelMeta to unset tag | Joey Hess | 2016-02-29 |
| | | | | | | | | No behavior change, just simplification. | ||
| * | add news item for git-annex 6.20160229 | Joey Hess | 2016-02-29 |
| | | |||
| * | leap year release6.20160229 | Joey Hess | 2016-02-29 |
| | | |||
| * | forgot to add this comment earlier | Joey Hess | 2016-02-29 |
| | | |||
| * | comment | Joey Hess | 2016-02-29 |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-02-29 |
| |\ | |||
| * | | fix android build | Joey Hess | 2016-02-29 |
| | | | |||
| | * | (no commit message) | grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f | 2016-02-29 |
| |/ | |||
| * | remove lower-casing of field names; metadata fields are case-insensative | Joey Hess | 2016-02-28 |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-02-28 |
| |\ | |||
| * | | The pre-commit-annex hook script that automatically extracts metadata has ↵ | Joey Hess | 2016-02-28 |
| | | | | | | | | | | | | been updated to also use exiftool. Thanks, Klaus Ethgen. | ||
| | * | Added a comment: Some additional notes | page | 2016-02-28 |
| |/ | |||
| * | Support --metadata field<number, --metadata field>number etc to match ranges ↵ | Joey Hess | 2016-02-27 |
| | | | | | | | | | | | | | | of numeric values. Similarly (well, for free), support preferred content expressions like metadata=field<number and metadata=field>number | ||
| * | close bug and changelog | Joey Hess | 2016-02-26 |
| | | | | | | | | finished testing recent commits, and I did solve it | ||
| * | better forcing of hash | Joey Hess | 2016-02-26 |
| | | |||
| * | forgot to use sfile | Joey Hess | 2016-02-26 |
| | | |||
| * | try again at forcing file read while hashing | Joey Hess | 2016-02-26 |
| | | |||
| * | update | Joey Hess | 2016-02-26 |
| | | |||
| * | bug | Joey Hess | 2016-02-26 |
| | | |||
| * | close | Joey Hess | 2016-02-26 |
| | | |||
| * | test revert "force hash to finish with file before returning" | Joey Hess | 2016-02-26 |
| | | | | | | | | | | | | This reverts commit d11b032bd86ebe69f1d08e382bd83370db8ea9b9. This seems to have caused a memory leak. | ||
| * | typo | Joey Hess | 2016-02-26 |
| | | |||
| * | Include magic database in the linux and OSX standalone builds. | Joey Hess | 2016-02-26 |
| | | |||
| * | (no commit message) | https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 | 2016-02-26 |
| | | |||
| * | (no commit message) | https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 | 2016-02-26 |
| | | |||
| * | Added a comment | divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899 | 2016-02-26 |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-02-25 |
| |\ | |||
| * | | devblog | Joey Hess | 2016-02-25 |
| | | | |||
* | | | adjusted branches, proof of concept | Joey Hess | 2016-02-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git annex adjust" may be a temporary interface, but works for a proof of concept. It is pretty fast at creating the adjusted branch. The main overhead is injecting pointer files. It might be worth optimising that by reusing the symlink target as the pointer file content. When I tried to do that, the problem was that the clean filter doesn't use that same format, and so git thought files had changed. Could be dealt with, perhaps make the clean filter use symlink format for pointer files when on an adjusted branch? But the real overhead is in checking out the branch, when git runs the smudge filter once per file. That is perhaps too slow to be usable, although it may only affect initial checkout of the branch, and not updates. TBD. | ||
* | | | add hashPointerFile' | Joey Hess | 2016-02-25 |
|/ / | |||
* | | add catCommit | Joey Hess | 2016-02-25 |
| | | |||
* | | add fromBlobType | Joey Hess | 2016-02-25 |
| | | |||
* | | factor out commitTree | Joey Hess | 2016-02-25 |
| | | |||
* | | add catCommit, with commit object parser | Joey Hess | 2016-02-25 |
| | | |||
* | | refactor | Joey Hess | 2016-02-25 |
| | |