Commit message (Expand) | Author | Age | |
---|---|---|---|
* | improved direct mode dir/file conflicted merge resultion, using tree grafting | Joey Hess | 2014-03-04 |
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-03-04 |
|\ | |||
* | | much improved test and real fix for FAT symlink loss on conflicted merge | Joey Hess | 2014-03-04 |
* | | improved test for FAT symlink regressions | Joey Hess | 2014-03-04 |
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M | 2014-03-04 |
* | | fix environment propigation in windows test suite | Joey Hess | 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 |
* | | add test cases for the new direct mode merge bug | Joey Hess | 2014-03-04 |
| * | Added a comment | http://joeyh.name/ | 2014-03-03 |
* | | fix a9067868a8594577ead2ecbe55f9563bef12f26d to handle annexed files in confl... | Joey Hess | 2014-03-03 |
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M | 2014-03-03 |
* | | rename for clarity | Joey Hess | 2014-03-03 |
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M | 2014-03-03 |
* | | simplfy | Joey Hess | 2014-03-03 |
|/ | |||
* | fixed initial reported problem but not out of the woods yet in some related c... | Joey Hess | 2014-03-03 |
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-03-03 |
|\ | |||
* | | sync: Fix bug in direct mode that caused a file not checked into git to be de... | Joey Hess | 2014-03-03 |
| * | (no commit message) | http://joeyh.name/ | 2014-03-03 |
|/ | |||
* | fix handling of nonexistant hook | Joey Hess | 2014-03-03 |
* | add link to darktable-git-annex | Joey Hess | 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://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus | 2014-03-03 |
* | number list | Joey Hess | 2014-03-02 |
* | decruft | Joey Hess | 2014-03-02 |
* | devblog | Joey Hess | 2014-03-02 |
* | pre-commit-annex hook script to automatically extract metadata from lots of t... | Joey Hess | 2014-03-02 |
* | update | Joey Hess | 2014-03-02 |
* | view: Refuse to enter a view when no branch is currently checked out. | Joey Hess | 2014-03-02 |
* | update | Joey Hess | 2014-03-02 |
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-03-02 |
|\ | |||
* | | doc improvements | Joey Hess | 2014-03-02 |
* | | fix combining of FIlterValues | Joey Hess | 2014-03-02 |
* | | vadd: Allow listing multiple desired values for a field. | Joey Hess | 2014-03-02 |
* | | view, vfilter: Add support for filtering tags and values out of a view, using... | Joey Hess | 2014-03-02 |
| * | 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: Didn't work | https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o | 2014-03-01 |
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c | 2014-03-01 |
| * | 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 |
| * | (no commit message) | gueux | 2014-03-01 |
|/ | |||
* | simplify | Joey Hess | 2014-03-01 |
* | windows build script back to normal | Joey Hess | 2014-03-01 |
* | retrying windows yesod-static | Joey Hess | 2014-03-01 |
* | annex.listen can be configured, instead of using --listen | Joey Hess | 2014-03-01 |
* | Revert "force cabal rebuild on windows for warp-tls" | Joey Hess | 2014-02-28 |
* | force cabal rebuild on windows for warp-tls | Joey Hess | 2014-02-28 |
* | devblog | Joey Hess | 2014-02-28 |