summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
* | view, vfilter: Add support for filtering tags and values out of a view, using...Gravatar Joey Hess2014-03-02
| * Added a commentGravatar https://id.koumbit.net/anarcat2014-03-02
| * Added a comment: XMPP something to do with it?Gravatar https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY2014-03-02
| * Added a comment: Didn't workGravatar https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o2014-03-01
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c2014-03-01
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-03-01
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-03-01
| * (no commit message)Gravatar gueux2014-03-01
|/
* simplifyGravatar Joey Hess2014-03-01
* windows build script back to normalGravatar Joey Hess2014-03-01
* retrying windows yesod-staticGravatar Joey Hess2014-03-01
* annex.listen can be configured, instead of using --listenGravatar Joey Hess2014-03-01
* Revert "force cabal rebuild on windows for warp-tls"Gravatar Joey Hess2014-02-28
* force cabal rebuild on windows for warp-tlsGravatar Joey Hess2014-02-28
* devblogGravatar Joey Hess2014-02-28