aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* fix a minor fd leakGravatar Joey Hess2013-05-27
* avoid debug logging unknown xmpp messages, which may contain sensative inform...Gravatar Joey Hess2013-05-27
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-27
|\
* | when xmpp connection fails, show the host(s) it tried to connect toGravatar Joey Hess2013-05-27
| * Added a commentGravatar http://joeyh.name/2013-05-27
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM2013-05-27
| * Added a commentGravatar http://joeyh.name/2013-05-27
* | remove debug printGravatar Joey Hess2013-05-27
|/
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o2013-05-27
* initial addGravatar http://sam.mingolelli.pip.verisignlabs.com/2013-05-27
* poll vote (/sdcard/annex)Gravatar 79.207.25.102013-05-27
* Added a commentGravatar http://joeyh.name/2013-05-27
* Added a commentGravatar http://edheil.wordpress.com/2013-05-27
* Added a commentGravatar http://joeyh.name/2013-05-27
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-26
|\
| * (no commit message)Gravatar http://tiker.net/openid/2013-05-27
* | 3 more fd leaksGravatar Joey Hess2013-05-26
| * (no commit message)Gravatar http://edheil.wordpress.com/2013-05-27
|/
* XMPP: Fix a file descriptor leak.Gravatar Joey Hess2013-05-26
* blog for the 1/2 dayGravatar Joey Hess2013-05-26
* fix merge conflict resolution when both sides have the same keyGravatar Joey Hess2013-05-26
* fix Android build, broken for 2 daysGravatar Joey Hess2013-05-26
* correct recent fixGravatar Joey Hess2013-05-26
* sync: Fix double merge conflict resolution handling.Gravatar Joey Hess2013-05-26
* typoGravatar Joey Hess2013-05-26
* avoid redundant CanPush messages with different shas being queued upGravatar Joey Hess2013-05-26
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-26
|\
* | reduce the amount of subdirectories created by the fuzz tester to saner limitGravatar Joey Hess2013-05-26
* | make fuzztest honor annex.diskreserveGravatar Joey Hess2013-05-26
* | fix warningGravatar Joey Hess2013-05-26
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-26
|/
* more windows fixesGravatar Joey Hess2013-05-26
* typoGravatar Joey Hess2013-05-26
* fix windows buildGravatar Joey Hess2013-05-26
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc2013-05-26
* Added a commentGravatar annexuser2013-05-25
* fuzz test discovered a way automatic merge resultion can fail; fixGravatar Joey Hess2013-05-25
* fuzz tester: avoid deleting entire repository (had to happen eventually, right?)Gravatar Joey Hess2013-05-25
* fixGravatar Joey Hess2013-05-25
* fuzz improvementsGravatar Joey Hess2013-05-25
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-25
|\
* | tune frequencies to avoid enormous trees being createdGravatar Joey Hess2013-05-25
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o2013-05-25
|/
* blog for the daysGravatar Joey Hess2013-05-25
* make fuzz test also output its actions to stdoutGravatar Joey Hess2013-05-25
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-25
|\
* \ Merge branch 'robustness'Gravatar Joey Hess2013-05-25
|\ \
| * | make direct mode merge cleanup more robustGravatar Joey Hess2013-05-25
| * | improve robustness of fromDirect and replaceFileGravatar Joey Hess2013-05-25
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA2013-05-25