summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' into tasty-testsGravatar Joey Hess2013-11-14
|\ | | | | | | | | Conflicts: Test.hs
* | finished converting test suite for tastyGravatar Joey Hess2013-11-14
| | | | | | | | Also merged in Test.hs from master.
| * update test suite for status -> info renameGravatar Joey Hess2013-11-14
| |
| * fixGravatar Joey Hess2013-11-14
| |
| * formatGravatar Joey Hess2013-11-14
| |
| * on second thought, don't change sync to exit nonzero on successful ↵Gravatar Joey Hess2013-11-14
| | | | | | | | | | | | conflicted merge resolution For one thing, that breaks the test suite. May revisit later.
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-14
| |\
| * | mavericksGravatar Joey Hess2013-11-14
| | |
| * | add a note after successful conflicted merge resolutionGravatar Joey Hess2013-11-14
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| | |
| | * Added a comment: ConfirmedGravatar https://www.google.com/accounts/o8/id?id=AItOawlHNJ7FpiXJNwSmojlwKwXhhF5QvwpNPmI2013-11-14
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-14
| |\
| | * Added a commentGravatar http://joeyh.name/2013-11-14
| | |
| | * Added a commentGravatar http://joeyh.name/2013-11-14
| | |
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-14
| |\|
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| | |
| | * Added a commentGravatar http://joeyh.name/2013-11-14
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| | |
| | * Added a commentGravatar http://id.clacke.se/2013-11-14
| | |
| | * (no commit message)Gravatar gueux2013-11-14
| | |
| | * Added a comment: Any further info regarding gitolite support?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmbo-yMzW_lkBrS4ICNn5XMr8saYtI1_WY2013-11-14
| | |
| * | copied a very interesting comment from the poll siteGravatar Joey Hess2013-11-13
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-13
| |\ | | | | | | | | | | | | | | | | | | Conflicts: doc/polls/2013/direct_vs_indirect_mode.mdwn doc/polls/2013/number_of_repositories.mdwn doc/polls/2013/using_for.mdwn
| | * poll vote (personal data)Gravatar https://id.koumbit.net/anarcat2013-11-14
| | |
| * | polls moved (and synced)Gravatar Joey Hess2013-11-13
| | |
| | * poll vote (6-10)Gravatar https://id.koumbit.net/anarcat2013-11-14
| | |
| | * poll vote (I use mostly direct mode)Gravatar https://www.google.com/accounts/o8/id?id=AItOawn1QhtPvsRBV7pfaDW_ZTPFv_ZIxSzQ8Rg2013-11-14
| |/
| * moving to separate siteGravatar Joey Hess2013-11-13
| |
| * Added a comment: quite happyGravatar https://id.koumbit.net/anarcat2013-11-13
| |
| * poll vote (videos)Gravatar https://id.koumbit.net/anarcat2013-11-13
| |
| * poll vote (music)Gravatar https://id.koumbit.net/anarcat2013-11-13
| |
| * poll vote (happy)Gravatar https://id.koumbit.net/anarcat2013-11-13
| |
| * poll vote (completely ecstatic)Gravatar http://joeyh.name/2013-11-13
| |
| * poll vote (know it very well)Gravatar https://id.koumbit.net/anarcat2013-11-13
| |
| * poll vote (10+ GB)Gravatar 82.113.99.1722013-11-13
| |
| * poll vote (completely ecstatic)Gravatar 216.145.77.952013-11-13
| |
| * poll vote (happy)Gravatar 66.249.81.1572013-11-13
| |
| * poll vote (Linux)Gravatar https://id.koumbit.net/anarcat2013-11-13
| |
| * poll vote (I install the version provided by my OS distributor)Gravatar 217.129.96.2222013-11-13
| |
| * poll vote (11-20)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ2013-11-13
| |
| * poll vote (2-5)Gravatar 89.214.35.872013-11-13
| |
| * poll vote (Linux)Gravatar 2001:15c0:66bc:0:f2de:f1ff:fe77:7ecb2013-11-13
| |
| * poll vote (Windows)Gravatar 2001:15c0:66bc:0:f2de:f1ff:fe77:7ecb2013-11-13
| |
| * poll vote (2-5)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ2013-11-13
| |
| * poll vote (I use mostly the git-annex assistant)Gravatar 2001:15c0:66bc:0:f2de:f1ff:fe77:7ecb2013-11-13
| |