Commit message (Expand) | Author | Age | |
---|---|---|---|
* | annex.startupscan can be set to false to disable the assistant's startup scan. | 2014-03-05 | |
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-03-05 | |
|\ | |||
* | | retitle bug to something less attractive to entirely unrelated problems | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-03-05 | |
|\ | |||
* | | done | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | (no commit message) | 2014-03-05 | |
* | | webapp: Include no-pty in ssh authorized_keys lines. | 2014-03-05 | |
* | | update with user feedback | 2014-03-05 | |
* | | webdav: When built with a new enough haskell DAV (0.6), disable the http resp... | 2014-03-05 | |
* | | webapp: detect on first run if git is not installed, and tell the user, rathe... | 2014-03-05 | |
* | | update roadmap month | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
* | | dup | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
* | | moreinfo | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Warning messages on Nexus 5 | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | (no commit message) | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
|/ | |||
* | thought of another way to break prop_idempotent_key_decode | 2014-03-05 | |
* | quickcheck says: "a-s--a" is not a legal key filename | 2014-03-05 | |
* | fix build w/o TDFA | 2014-03-04 | |
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-03-04 | |
|\ | |||
* | | glacier: Pass --region to glacier checkpresent. | 2014-03-04 | |
| * | Added a comment | 2014-03-05 | |
| * | Added a comment | 2014-03-05 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-03-04 | |
|\ | |||
* | | more conflict resolution tests | 2014-03-04 | |
* | | style | 2014-03-04 | |
| * | (no commit message) | 2014-03-05 | |
|/ | |||
* | devblog | 2014-03-04 | |
* | sync: Automatically resolve merge conflict between and annexed file and a reg... | 2014-03-04 | |
* | add test case for merge conflict resolution between annexed and in-git file | 2014-03-04 | |
* | added test for conflict resolution with a file that is both deleted and modified | 2014-03-04 | |
* | factor out Annex.AutoMerge from Command.Sync | 2014-03-04 | |
* | idea | 2014-03-04 | |
* | fix test case to convert slashes for DOS | 2014-03-04 | |
* | improved direct mode dir/file conflicted merge resultion, using tree grafting | 2014-03-04 |