summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* fix typoGravatar https://www.google.com/accounts/o8/id?id=AItOawlLxKVJdtIlFyco0extRJZLAKoD7pBCL2c2014-04-13
* Added a comment: auto conflict resolution master branchGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-04-13
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-13
|\
* | Avoid depending on shakespeare except for when building the webapp.Gravatar Joey Hess2014-04-13
| * (no commit message)Gravatar divB2014-04-13
| * Fixed Shebang in script and typo.Gravatar http://ypid.wordpress.com/2014-04-13
| * make links to internal pages instead of only github to allow cross-finding th...Gravatar https://id.koumbit.net/anarcat2014-04-13
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlqL3QbH6hrzf4XT-OW5IcMj6zSrMWl2dg2014-04-13
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-12
|\
* | day's sponsorGravatar Joey Hess2014-04-12
* | devblogGravatar Joey Hess2014-04-12
| * poll vote (DCIM directory (photos and videos only))Gravatar 2601:0:b100:7c0::12014-04-12
|/
* add new testGravatar Joey Hess2014-04-12
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-12
|\
* | wrote test case; found bugs in date math; fixed and simplified using Data.Tim...Gravatar Joey Hess2014-04-12
* | Improve handling on monthly/yearly scheduling.Gravatar Joey Hess2014-04-12
| * Add doc/bugs/Drop_--from_always_trusts_local_repository.mdwnGravatar David Triendl2014-04-12
| * removedGravatar https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf5742014-04-12
|/
* Improve handling on monthly/yearly scheduling.Gravatar Joey Hess2014-04-11
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
|\
* | devblogGravatar Joey Hess2014-04-11
| * use ustar format and omit filnames with colons. new hackage requirementsGravatar Joey Hess2014-04-11
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
| |\ | |/ |/|
* | add news item for git-annex 5.20140412Gravatar Joey Hess2014-04-11
* | prep release5.20140412Gravatar Joey Hess2014-04-11
* | guard against any remaining infinite recursion bugs; throw error if no candid...Gravatar Joey Hess2014-04-11
* | Last release didn't quite fix the high cpu issue in all cases, this should.Gravatar Joey Hess2014-04-11
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
| |\ | |/ |/|
* | add news item for git-annex 5.20140411Gravatar Joey Hess2014-04-11
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
| |\
* | | more prep5.20140411Gravatar Joey Hess2014-04-11
| |/ |/|
* | prep releaseGravatar Joey Hess2014-04-11
* | rename confusingly named "day"Gravatar Joey Hess2014-04-11
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
|\ \
* | | assistant: Fix high CPU usage triggered when a monthly fsck is scheduled, and...Gravatar Joey Hess2014-04-11
| | * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
| | |\ | | |/ | |/|
| * | Added a commentGravatar http://joeyh.name/2014-04-11
| | * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
| | |\ | | |/ | |/|
* / | typoGravatar Joey Hess2014-04-11
|/ /
* | note that GIT_ANNEX_SHELL_READONLY does not imply GIT_ANNEX_SHELL_LIMITEDGravatar Joey Hess2014-04-11
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
|\ \
* | | update for g3Gravatar Joey Hess2014-04-11
| | * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-11
| | |\ | | |/ | |/|
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawn6-8_3tbusU0Myh97-GGuGUY9bBoBP3bQ2014-04-11
|/ /
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-10
| |\ | |/ |/|
* | Fix rsync progress parsing in locales that use comma in number display. Close...Gravatar Joey Hess2014-04-10
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-10
| |\ | |/ |/|
* | updateGravatar Joey Hess2014-04-10
* | nuke tmp dir so things don't linger between buildsGravatar Joey Hess2014-04-10
* | note automatic upgrade issueGravatar Joey Hess2014-04-10