aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | Added a commentGravatar http://joeyh.name/2014-03-05
* | | dupGravatar Joey Hess2014-03-05
| * | Added a commentGravatar http://joeyh.name/2014-03-05
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M2014-03-05
* | | moreinfoGravatar Joey Hess2014-03-05
| * | Added a commentGravatar http://joeyh.name/2014-03-05
| * | Added a commentGravatar http://joeyh.name/2014-03-05
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c2014-03-05
| * | Warning messages on Nexus 5Gravatar https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ2014-03-05
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns2014-03-05
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-03-05
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c2014-03-05
| * | Added a commentGravatar http://grossmeier.net/2014-03-05
| * | Added a commentGravatar http://grossmeier.net/2014-03-05
|/ /
* | thought of another way to break prop_idempotent_key_decodeGravatar Joey Hess2014-03-05
* | quickcheck says: "a-s--a" is not a legal key filenameGravatar Joey Hess2014-03-05
* | fix build w/o TDFAGravatar Joey Hess2014-03-04
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-04
|\ \
* | | glacier: Pass --region to glacier checkpresent.Gravatar Joey Hess2014-03-04
| * | Added a commentGravatar http://joeyh.name/2014-03-05
| * | Added a commentGravatar http://joeyh.name/2014-03-05
|/ /
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-04
|\ \
* | | more conflict resolution testsGravatar Joey Hess2014-03-04
* | | styleGravatar Joey Hess2014-03-04
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnoIxJHzKbUOdNo41pRxRBj_y1bSoH-ziA2014-03-05
|/ /
* | devblogGravatar Joey Hess2014-03-04
* | sync: Automatically resolve merge conflict between and annexed file and a reg...Gravatar Joey Hess2014-03-04
* | add test case for merge conflict resolution between annexed and in-git fileGravatar Joey Hess2014-03-04
* | added test for conflict resolution with a file that is both deleted and modifiedGravatar Joey Hess2014-03-04
* | factor out Annex.AutoMerge from Command.SyncGravatar Joey Hess2014-03-04
* | ideaGravatar Joey Hess2014-03-04
* | fix test case to convert slashes for DOSGravatar Joey Hess2014-03-04
* | improved direct mode dir/file conflicted merge resultion, using tree graftingGravatar Joey Hess2014-03-04
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-04
|\ \
* | | much improved test and real fix for FAT symlink loss on conflicted mergeGravatar Joey Hess2014-03-04
* | | improved test for FAT symlink regressionsGravatar Joey Hess2014-03-04
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M2014-03-04
* | | fix environment propigation in windows test suiteGravatar Joey Hess2014-03-04
|/ /
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-04
|\ \
* | | finish fixing direct mode merge bug involving unstaged local filesGravatar Joey Hess2014-03-04
* | | add test cases for the new direct mode merge bugGravatar Joey Hess2014-03-04
| * | Added a commentGravatar http://joeyh.name/2014-03-03
* | | fix a9067868a8594577ead2ecbe55f9563bef12f26d to handle annexed files in confl...Gravatar Joey Hess2014-03-03
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M2014-03-03
* | | rename for clarityGravatar Joey Hess2014-03-03
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M2014-03-03
* | | simplfyGravatar Joey Hess2014-03-03
|/ /
* | fixed initial reported problem but not out of the woods yet in some related c...Gravatar Joey Hess2014-03-03
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-03
|\ \
* | | sync: Fix bug in direct mode that caused a file not checked into git to be de...Gravatar Joey Hess2014-03-03