aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | add a test case for merge conflict automatic resolutionGravatar Joey Hess2013-05-20
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
|/
* Fix a bug in the git-annex branch handling code that could cause info from a ...Gravatar Joey Hess2013-05-20
* run the test suite twice, once in direct modeGravatar Joey Hess2013-05-20
* minor optimisation and warning fixGravatar Joey Hess2013-05-20
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-20
|\
| * Added a commentGravatar http://joeyh.name/2013-05-20
* | direct mode bug fix: After a conflicted merge was automatically resolved, the...Gravatar Joey Hess2013-05-20
| * Added a commentGravatar http://joeyh.name/2013-05-20
| * Added a commentGravatar http://joeyh.name/2013-05-20
| * Added a commentGravatar http://edheil.wordpress.com/2013-05-20
| * Added a commentGravatar http://joeyh.name/2013-05-20
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-20
|\|
| * poll vote (/sdcard/annex)Gravatar 213.138.67.852013-05-20
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
| * Added a commentGravatar http://edheil.wordpress.com/2013-05-20
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
* | debian architecture build funGravatar Joey Hess2013-05-19
* | avoid failing build if cabal failed to updateGravatar Joey Hess2013-05-19
|/
* fix windows buildGravatar Joey Hess2013-05-19
* stupid windows..Gravatar Joey Hess2013-05-19
* seems windows sh doesn't properly handle set -e in functionsGravatar Joey Hess2013-05-19
* hmmGravatar Joey Hess2013-05-19
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-19
|\
* | do a clean build if incremental failsGravatar Joey Hess2013-05-19
| * add nntp remote pageGravatar http://joeyh.name/2013-05-20
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-19
|\|
* | blog for the dayGravatar Joey Hess2013-05-19
* | remove unnecessary bracketIOGravatar Joey Hess2013-05-19
| * Added a commentGravatar http://joeyh.name/2013-05-19
|/
* updateGravatar Joey Hess2013-05-19
* Allow building with gpg2.Gravatar Joey Hess2013-05-19
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-19
|\
| * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o2013-05-19
| * Add note about no webapp in RaringGravatar https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o2013-05-19
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-19
|\|
| * Added a comment: Official Raring build also does not have the Assistant enabledGravatar https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o2013-05-19
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ2013-05-19
* | ideaGravatar Joey Hess2013-05-19
| * Added a commentGravatar http://me.tinco.nl/2013-05-19
* | moreinfoGravatar Joey Hess2013-05-19
| * Added a commentGravatar http://joeyh.name/2013-05-19
| * Added a commentGravatar http://joeyh.name/2013-05-19
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-19
|\
* | close; was wrong passwordGravatar Joey Hess2013-05-19
| * Added a commentGravatar http://joeyh.name/2013-05-19
| * removedGravatar http://joeyh.name/2013-05-19