summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* annex.startupscan can be set to false to disable the assistant's startup scan.Gravatar Joey Hess2014-03-05
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-05
|\
* | retitle bug to something less attractive to entirely unrelated problemsGravatar 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 http://joeyh.name/2014-03-05
| * 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-05
|\
* | doneGravatar Joey Hess2014-03-05
| * Added a commentGravatar http://joeyh.name/2014-03-05
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ2014-03-05
* | webapp: Include no-pty in ssh authorized_keys lines.Gravatar Joey Hess2014-03-05
* | update with user feedbackGravatar Joey Hess2014-03-05
* | webdav: When built with a new enough haskell DAV (0.6), disable the http resp...Gravatar Joey Hess2014-03-05
* | webapp: detect on first run if git is not installed, and tell the user, rathe...Gravatar Joey Hess2014-03-05
* | update roadmap monthGravatar Joey Hess2014-03-05
| * 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