summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-03
|\
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-02
| * Added a commentGravatar http://joeyh.name/2012-06-01
| * Added a comment: sha256Gravatar https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c2012-06-01
| * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c2012-06-01
| * Added a comment: sha256 ?Gravatar https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c2012-06-01
| * check at configure time for sha commands in Mac OSX locationGravatar Joey Hess2012-05-31
| * Require that the SHA256 backend can be used when building, since it's the def...Gravatar Joey Hess2012-05-31
| * sha256sum not so optionalGravatar Joey Hess2012-05-31
| * add a nice oneGravatar Joey Hess2012-05-31
| * Fix display of warning message when encountering a file that uses an unsuppor...Gravatar Joey Hess2012-05-31
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-05-31
| |\
| * | import: New subcommand, pulls files from a directory outside the annex and ad...Gravatar Joey Hess2012-05-31
| * | add dirContentsRecursiveGravatar Joey Hess2012-05-31
| | * Discussion of NTFS symlinks, junction points, and reparse points.Gravatar josh2012-05-31
| | * Fix typo.Gravatar josh2012-05-31
| | * Add explanation of how git on Windows handles symlinks.Gravatar josh2012-05-31
| |/
| * updateGravatar Joey Hess2012-05-31
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-05-31
| |\
| * | updateGravatar Joey Hess2012-05-31
| * | updatesGravatar Joey Hess2012-05-31
| | * removedGravatar http://joeyh.name/2012-05-31
| | * Added a commentGravatar http://joeyh.name/2012-05-31
| | * Added a commentGravatar http://joeyh.name/2012-05-31
| | * Added a commentGravatar http://dlaxalde.myopenid.com/2012-05-31
| |/
| * pairingGravatar Joey Hess2012-05-30
| * Merge remote-tracking branch 'origin/master'Gravatar Joey Hess2012-05-30
| |\
| * | lock: Reset unlocked file to index, rather than to branch head.Gravatar Joey Hess2012-05-30
| | * Added a commentGravatar http://joeyh.name/2012-05-30
| | * smudge broken linkGravatar https://www.google.com/accounts/o8/id?id=AItOawlBSuP2uCSUr5ONRVoyL7jg0ZhBc5us_w02012-05-30
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY2012-05-30
* | | fixGravatar Joey Hess2012-05-29
|/ /
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY2012-05-30
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY2012-05-30
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY2012-05-30
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-05-29
|\|
* | updatesGravatar Joey Hess2012-05-29
| * Added a commentGravatar http://joeyh.name/2012-05-29
| * Added a commentGravatar http://joeyh.name/2012-05-29
| * Added a commentGravatar http://joeyh.name/2012-05-29
|/
* correct S3 environment variable namesGravatar Joey Hess2012-05-29
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-05-29
|\
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY2012-05-29
| * Added a comment: environment variablesGravatar https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY2012-05-29
| * Added a comment: ANNEX_S3 vs AWS for keysGravatar https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY2012-05-29
* | noteGravatar Joey Hess2012-05-28
|/
* update OSX instructions to use ghc7.0 branchGravatar Joey Hess2012-05-28
* updateGravatar Joey Hess2012-05-28
* typosGravatar Joey Hess2012-05-28
* updateGravatar Joey Hess2012-05-28