summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* 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
| * (no commit message)Gravatar http://joeyh.name/2014-03-03
|/
* fix handling of nonexistant hookGravatar Joey Hess2014-03-03
* add link to darktable-git-annexGravatar Joey Hess2014-03-03
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk2014-03-03
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk2014-03-03
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2014-03-03
* number listGravatar Joey Hess2014-03-02
* decruftGravatar Joey Hess2014-03-02
* devblogGravatar Joey Hess2014-03-02
* pre-commit-annex hook script to automatically extract metadata from lots of t...Gravatar Joey Hess2014-03-02
* updateGravatar Joey Hess2014-03-02
* view: Refuse to enter a view when no branch is currently checked out.Gravatar Joey Hess2014-03-02
* updateGravatar Joey Hess2014-03-02
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-02
|\
* | doc improvementsGravatar Joey Hess2014-03-02
* | fix combining of FIlterValuesGravatar Joey Hess2014-03-02
* | vadd: Allow listing multiple desired values for a field.Gravatar Joey Hess2014-03-02