summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* wait for git lstree to exitGravatar Joey Hess2016-01-01
* remove old TODOGravatar Joey Hess2016-01-01
* responseGravatar Joey Hess2016-01-01
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-01-01
|\
* | remporarily disable v6 unlocked test pass while it's failingGravatar Joey Hess2016-01-01
* | only do scan when there's a branch, not in freshly created new repoGravatar Joey Hess2016-01-01
* | reorderGravatar Joey Hess2016-01-01
* | scan for unlocked files on init/upgrade of v6 repoGravatar Joey Hess2016-01-01
* | updateGravatar Joey Hess2016-01-01
* | switch to using main ingest codeGravatar Joey Hess2016-01-01
* | started working on testing v6 unlocked filesGravatar Joey Hess2016-01-01
* | convert isPointerFile from Annex to IOGravatar Joey Hess2016-01-01
| * (no commit message)Gravatar markus@c65ad4f0b6624673047e959218d058eb73e7ff152016-01-01
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-31
|\
* | improve name of keys database lock fileGravatar Joey Hess2015-12-31
| * (no commit message)Gravatar lars@20e4ed7efd4581b7e490713058bd5f94e43488a12015-12-30
|/
* add test: conflict resolution (mixed locked and unlocked file)Gravatar Joey Hess2015-12-30
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-30
|\
* | test suite 100% pass in v6, finally!Gravatar Joey Hess2015-12-30
* | fix failing git-annex unused test case in v6Gravatar Joey Hess2015-12-30
* | set annex.largefiles earlier in test suiteGravatar Joey Hess2015-12-30
| * Added a comment: SELinuxGravatar divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f8992015-12-30
| * Added a comment: Logcat output -- SELinuxGravatar divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f8992015-12-30
|/
* move check for if direct mode is supported to the right placeGravatar Joey Hess2015-12-29
* devblogGravatar Joey Hess2015-12-29
* updateGravatar Joey Hess2015-12-29
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-29
|\
* | flush queue before cleaning cruftGravatar Joey Hess2015-12-29
* | test suite noticed a direct mode reversionGravatar Joey Hess2015-12-29
* | renameGravatar Joey Hess2015-12-29
| * Added a comment: Link to THGravatar umeboshi2015-12-29
* | don't disable smudge filter while mergingGravatar Joey Hess2015-12-29
* | avoid renaming file when auto-resolving conflict in annex pointerGravatar Joey Hess2015-12-29
* | fix inode cache consistency bug when a merge unlocks a present fileGravatar Joey Hess2015-12-29
* | automatic conflict resolution for v6 unlocked filesGravatar Joey Hess2015-12-29
| * (no commit message)Gravatar ColinW2015-12-29
| * Added a comment: Replacing dashes with underscoresGravatar joseph.rawson.works@85a210ab8c0e37a0b2d6bb235738b20e23e8878f2015-12-28
| * Added a comment: ssh keys, github, xmppGravatar joseph.rawson.works@85a210ab8c0e37a0b2d6bb235738b20e23e8878f2015-12-28
|/
* fix build with pre-AMP ghcGravatar Joey Hess2015-12-28
* add .stack-workGravatar Joey Hess2015-12-28
* defer find to after buildGravatar Joey Hess2015-12-28
* improve binary findingGravatar Joey Hess2015-12-28
* remove Inotify build flagGravatar Joey Hess2015-12-28
* remove win32-extras; was merged into stackageGravatar Joey Hess2015-12-28
* fix formatGravatar Joey Hess2015-12-28
* remove XMPP, DBus, DesktopNotify build flagsGravatar Joey Hess2015-12-28
* enable xmpp in stack.yamlGravatar Joey Hess2015-12-28
* support building with BUILDER=stack to use stack instead of cabalGravatar Joey Hess2015-12-28
* point to bug reportGravatar Joey Hess2015-12-28
* switch to nightly-2015-12-28Gravatar Joey Hess2015-12-28
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 02:59:02 +0000