summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Added a forum post asking how to make locally cached files stay up to date ↵Gravatar https://www.google.com/accounts/o8/id?id=AItOawlu7K3h7Ry1uDAU_ERYGuqt0LoGNJqGuRo2012-06-04
| | | | across both rename and modify.
* simplify OSX installation instructionsGravatar Joey Hess2012-06-03
| | | | | The new Haskell Platform was released today, with the new ghc git-annex's master branch needs, so cabal should be usable again on OSX.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-03
|\ | | | | | | | | Conflicts: doc/tips/using_Amazon_S3.mdwn
| * 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 ↵Gravatar Joey Hess2012-05-31
| | | | | | | | default.
| * 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 ↵Gravatar Joey Hess2012-05-31
| | | | | | | | unsupported backend.
| * 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 ↵Gravatar Joey Hess2012-05-31
| | | | | | | | | | | | | | | | | | adds them Use case for this was developed somewhere on the Transiberian Railroad.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | Resetting an unlocked file to the branch head failed if it had just been added, not committed, and unlocked, since the branch didbn't have it. The code was concerned about dropping any changes that might be staged in the index, but I cannot see why.
| | * 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
| | | | Needed until the next Haskell Platform provides a new ghc.
* updateGravatar Joey Hess2012-05-28
|