Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | add a test case for merge conflict automatic resolution | Joey Hess | 2013-05-20 | |
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 | |
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 | |
|/ | ||||
* | Fix a bug in the git-annex branch handling code that could cause info from a ... | Joey Hess | 2013-05-20 | |
* | run the test suite twice, once in direct mode | Joey Hess | 2013-05-20 | |
* | minor optimisation and warning fix | Joey Hess | 2013-05-20 | |
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-20 | |
|\ | ||||
| * | Added a comment | http://joeyh.name/ | 2013-05-20 | |
* | | direct mode bug fix: After a conflicted merge was automatically resolved, the... | Joey Hess | 2013-05-20 | |
| * | Added a comment | http://joeyh.name/ | 2013-05-20 | |
| * | Added a comment | http://joeyh.name/ | 2013-05-20 | |
| * | Added a comment | http://edheil.wordpress.com/ | 2013-05-20 | |
| * | Added a comment | http://joeyh.name/ | 2013-05-20 | |
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 | |
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 | |
* | | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-20 | |
|\| | ||||
| * | poll vote (/sdcard/annex) | 213.138.67.85 | 2013-05-20 | |
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 | |
| * | Added a comment | http://edheil.wordpress.com/ | 2013-05-20 | |
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 | |
* | | debian architecture build fun | Joey Hess | 2013-05-19 | |
* | | avoid failing build if cabal failed to update | Joey Hess | 2013-05-19 | |
|/ | ||||
* | fix windows build | Joey Hess | 2013-05-19 | |
* | stupid windows.. | Joey Hess | 2013-05-19 | |
* | seems windows sh doesn't properly handle set -e in functions | Joey Hess | 2013-05-19 | |
* | hmm | Joey Hess | 2013-05-19 | |
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 | |
|\ | ||||
* | | do a clean build if incremental fails | Joey Hess | 2013-05-19 | |
| * | add nntp remote page | http://joeyh.name/ | 2013-05-20 | |
* | | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 | |
|\| | ||||
* | | blog for the day | Joey Hess | 2013-05-19 | |
* | | remove unnecessary bracketIO | Joey Hess | 2013-05-19 | |
| * | Added a comment | http://joeyh.name/ | 2013-05-19 | |
|/ | ||||
* | update | Joey Hess | 2013-05-19 | |
* | Allow building with gpg2. | Joey Hess | 2013-05-19 | |
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 | |
|\ | ||||
| * | removed | https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o | 2013-05-19 | |
| * | Add note about no webapp in Raring | https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o | 2013-05-19 | |
* | | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 | |
|\| | ||||
| * | Added a comment: Official Raring build also does not have the Assistant enabled | https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o | 2013-05-19 | |
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ | 2013-05-19 | |
* | | idea | Joey Hess | 2013-05-19 | |
| * | Added a comment | http://me.tinco.nl/ | 2013-05-19 | |
* | | moreinfo | Joey Hess | 2013-05-19 | |
| * | Added a comment | http://joeyh.name/ | 2013-05-19 | |
| * | Added a comment | http://joeyh.name/ | 2013-05-19 | |
|/ | ||||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 | |
|\ | ||||
* | | close; was wrong password | Joey Hess | 2013-05-19 | |
| * | Added a comment | http://joeyh.name/ | 2013-05-19 | |
| * | removed | http://joeyh.name/ | 2013-05-19 |