Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ | 2014-03-05 | |
* | | | webapp: Include no-pty in ssh authorized_keys lines. | Joey Hess | 2014-03-05 | |
* | | | update with user feedback | Joey Hess | 2014-03-05 | |
* | | | webdav: When built with a new enough haskell DAV (0.6), disable the http resp... | Joey Hess | 2014-03-05 | |
* | | | webapp: detect on first run if git is not installed, and tell the user, rathe... | Joey Hess | 2014-03-05 | |
* | | | update roadmap month | Joey Hess | 2014-03-05 | |
| * | | Added a comment | http://joeyh.name/ | 2014-03-05 | |
* | | | dup | Joey Hess | 2014-03-05 | |
| * | | Added a comment | http://joeyh.name/ | 2014-03-05 | |
| * | | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M | 2014-03-05 | |
* | | | moreinfo | Joey Hess | 2014-03-05 | |
| * | | Added a comment | http://joeyh.name/ | 2014-03-05 | |
| * | | Added a comment | http://joeyh.name/ | 2014-03-05 | |
| * | | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c | 2014-03-05 | |
| * | | Warning messages on Nexus 5 | https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ | 2014-03-05 | |
| * | | 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 | |
| * | | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c | 2014-03-05 | |
| * | | Added a comment | http://grossmeier.net/ | 2014-03-05 | |
| * | | Added a comment | http://grossmeier.net/ | 2014-03-05 | |
|/ / | ||||
* | | thought of another way to break prop_idempotent_key_decode | Joey Hess | 2014-03-05 | |
* | | quickcheck says: "a-s--a" is not a legal key filename | Joey Hess | 2014-03-05 | |
* | | fix build w/o TDFA | Joey Hess | 2014-03-04 | |
* | | 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 | |
| * | | Added a comment | http://joeyh.name/ | 2014-03-05 | |
| * | | Added a comment | http://joeyh.name/ | 2014-03-05 | |
|/ / | ||||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-03-04 | |
|\ \ | ||||
* | | | more conflict resolution tests | Joey Hess | 2014-03-04 | |
* | | | style | Joey Hess | 2014-03-04 | |
| * | | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawnoIxJHzKbUOdNo41pRxRBj_y1bSoH-ziA | 2014-03-05 | |
|/ / | ||||
* | | devblog | Joey Hess | 2014-03-04 | |
* | | sync: Automatically resolve merge conflict between and annexed file and a reg... | Joey Hess | 2014-03-04 | |
* | | add test case for merge conflict resolution between annexed and in-git file | Joey Hess | 2014-03-04 | |
* | | added test for conflict resolution with a file that is both deleted and modified | Joey Hess | 2014-03-04 | |
* | | factor out Annex.AutoMerge from Command.Sync | Joey Hess | 2014-03-04 | |
* | | idea | Joey Hess | 2014-03-04 | |
* | | fix test case to convert slashes for DOS | Joey Hess | 2014-03-04 | |
* | | 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 |