Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | 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 | ||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-03-04 | ||
|\ \ | ||||
* | | | much improved test and real fix for FAT symlink loss on conflicted merge | 2014-03-04 | ||
* | | | improved test for FAT symlink regressions | 2014-03-04 | ||
| * | | Added a comment | 2014-03-04 | ||
* | | | fix environment propigation in windows test suite | 2014-03-04 | ||
|/ / | ||||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-03-04 | ||
|\ \ | ||||
* | | | finish fixing direct mode merge bug involving unstaged local files | 2014-03-04 | ||
* | | | add test cases for the new direct mode merge bug | 2014-03-04 | ||
| * | | Added a comment | 2014-03-03 | ||
* | | | fix a9067868a8594577ead2ecbe55f9563bef12f26d to handle annexed files in confl... | 2014-03-03 | ||
| * | | (no commit message) | 2014-03-03 | ||
* | | | rename for clarity | 2014-03-03 | ||
| * | | (no commit message) | 2014-03-03 | ||
* | | | simplfy | 2014-03-03 | ||
|/ / | ||||
* | | fixed initial reported problem but not out of the woods yet in some related c... | 2014-03-03 | ||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-03-03 | ||
|\ \ | ||||
* | | | sync: Fix bug in direct mode that caused a file not checked into git to be de... | 2014-03-03 |