Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns | 2014-03-05 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8 | 2014-03-05 |
| | |||
* | Added a comment | http://grossmeier.net/ | 2014-03-05 |
| | |||
* | Added a comment | http://grossmeier.net/ | 2014-03-05 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-03-04 |
|\ | |||
* | | glacier: Pass --region to glacier checkpresent. | Joey Hess | 2014-03-04 |
| | | | | | | | | | | I suppose this is not necessary when it has a local cache, so I didn't notice it was missing. | ||
| * | Added a comment | http://joeyh.name/ | 2014-03-05 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2014-03-05 |
|/ | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawnoIxJHzKbUOdNo41pRxRBj_y1bSoH-ziA | 2014-03-05 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M | 2014-03-04 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-03-04 |
|\ | |||
* | | finish fixing direct mode merge bug involving unstaged local files | Joey Hess | 2014-03-04 |
| | | | | | | | | | | | | | | | | | | | | Added test cases for both ways this can happen, with a conflict involving a file, or a directory. Cleaned up resolveMerge to not touch the work tree in direct mode, which turned out to be the only way to handle things.. And makes it much nicer. Still need to run test suite on windows. | ||
| * | Added a comment | http://joeyh.name/ | 2014-03-03 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M | 2014-03-03 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M | 2014-03-03 |
|/ | |||
* | fixed initial reported problem but not out of the woods yet in some related ↵ | Joey Hess | 2014-03-03 |
| | | | | cases | ||
* | (no commit message) | http://joeyh.name/ | 2014-03-03 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk | 2014-03-03 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk | 2014-03-03 |
| | |||
* | Added a comment | https://id.koumbit.net/anarcat | 2014-03-02 |
| | |||
* | Added a comment: XMPP something to do with it? | https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY | 2014-03-02 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8 | 2014-03-01 |
| | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8 | 2014-03-01 |
| | |||
* | remove buggy --listen=host:port support | Joey Hess | 2014-02-28 |
| | |||
* | Probe for quvi version at run time. | Joey Hess | 2014-02-28 |
| | | | | | Overhead: git annex addurl runs quvi --version once. And more bloat to Annex state.. | ||
* | Added a comment | EskildHustvedt | 2014-02-28 |
| | |||
* | Added a comment | http://joeyh.name/ | 2014-02-28 |
| | |||
* | (no commit message) | EskildHustvedt | 2014-02-28 |
| | |||
* | Added a comment | Hanno | 2014-02-27 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-02-27 |
|\ | |||
* | | close | Joey Hess | 2014-02-27 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2014-02-27 |
|/ | |||
* | Added a comment | EskildHustvedt | 2014-02-27 |
| | |||
* | (no commit message) | philm | 2014-02-27 |
| | |||
* | Added a comment | http://joeyh.name/ | 2014-02-26 |
| | |||
* | Added a comment | http://joeyh.name/ | 2014-02-26 |
| | |||
* | Added a comment | http://joeyh.name/ | 2014-02-26 |
| | |||
* | Added a comment: Re: No working ubuntu package | fmarier | 2014-02-26 |
| | |||
* | Added a comment: I got this error too. | https://www.google.com/accounts/o8/id?id=AItOawlm_3m5gLhML9bHbZ8FpJ-HBZhWaRfFeO8 | 2014-02-25 |
| | |||
* | Added a comment: any ideas or questions? | https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk | 2014-02-25 |
| | |||
* | (no commit message) | EskildHustvedt | 2014-02-25 |
| | |||
* | Added a comment | http://joeyh.name/ | 2014-02-24 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-02-24 |
|\ | |||
* | | webdav: When built with DAV 0.6.0, use the new DAV monad to avoid locking ↵ | Joey Hess | 2014-02-24 |
| | | | | | | | | files, which is not needed by git-annex's use of webdav, and does not work on Box.com. | ||
| * | Added a comment: sounds good | https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI | 2014-02-24 |
|/ | |||
* | Added a comment | http://joeyh.name/ | 2014-02-24 |
| | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI | 2014-02-24 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8 | 2014-02-24 |
| | |||
* | Added a comment: Ídea | stp | 2014-02-23 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-02-21 |
|\ |