summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' into desymlinkGravatar Joey Hess2012-12-13
|\ | | | | | | | | | | | | | | Conflicts: Annex/CatFile.hs Annex/Content.hs Git/LsFiles.hs Git/LsTree.hs
| * finished where indentation changesGravatar Joey Hess2012-12-13
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-12
| |\
| * | try skipping OSX frameworksGravatar Joey Hess2012-12-12
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY2012-12-13
| | |
| | * Added a comment: OS/X build 2012-12-12Gravatar https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY2012-12-13
| | |
| | * Added a commentGravatar http://joeyh.name/2012-12-12
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-12
| |\
| * | blog for the dayGravatar Joey Hess2012-12-12
| | |
| * | updateGravatar Joey Hess2012-12-12
| | |
* | | direct mode committingGravatar Joey Hess2012-12-12
| | |
| | * (no commit message)Gravatar http://grossmeier.net/2012-12-12
| |/
* | starting a page about direct modeGravatar Joey Hess2012-12-12
| |
* | add notStagedGravatar Joey Hess2012-12-12
| |
* | where indentationGravatar Joey Hess2012-12-12
| |
* | remove unused functionGravatar Joey Hess2012-12-12
| |
* | fix associated files to not fall back to object locationGravatar Joey Hess2012-12-12
| |
* | also update direct mode associated files in local mergeGravatar Joey Hess2012-12-12
| |
* | make parent directoryGravatar Joey Hess2012-12-12
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-12
| |\
| * | put sbin directories in PATH when building standalone so lsof is foundGravatar Joey Hess2012-12-12
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that the standalone builds will include lsof, and it'll then be in the runshell PATH, so will work. This does not deal with manual builds where lsof is not in path, which will fail at runtime due to the program being missing.
| | * Added a comment: "removing" vs dropGravatar http://lj.rossia.org/users/imz/2012-12-12
| | |
| | * (no commit message)Gravatar http://edheil.wordpress.com/2012-12-11
| |/
| * remove set -eGravatar Joey Hess2012-12-11
| | | | | | | | Not sure why this is failing w/o an error message.
| * reorgGravatar Joey Hess2012-12-11
| |
| * add news item for git-annex 3.20121211Gravatar Joey Hess2012-12-11
| |
| * adjust versionGravatar Joey Hess2012-12-11
| |
| * releasing version 3.201212113.20121211Gravatar Joey Hess2012-12-11
| |
| * minor reorgGravatar Joey Hess2012-12-11
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-11
| |\
| * | switch back to WITH_DNSGravatar Joey Hess2012-12-11
| | | | | | | | | | | | This is because host is not included in the standalone builds.
| | * Added a commentGravatar http://edheil.wordpress.com/2012-12-11
| | |
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-11
| |\|
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-12-11
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkk3K0AUduAybbBO_LRRGKOe2zcGeezbzI2012-12-11
| | |
| * | updateGravatar Joey Hess2012-12-10
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-10
| |\
| * | blog for the dayGravatar Joey Hess2012-12-10
| | |
| | * Added a commentGravatar http://joeyh.name/2012-12-10
| |/
| * fix preferred content definition for the backup groupGravatar Joey Hess2012-12-10
| | | | | | | | | | Broken by commit 2a04e215e10469ee3bab5d1a5d6d76b0c35cc46c, which made empty preferred content strings match nothing, rather than everything.
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-10
| |\
| * | require all THIRDPARTY_BINS be present to build standalone/appGravatar Joey Hess2012-12-10
| | | | | | | | | | | | It's just not acceptable for eg, lsof to be left out.
| | * Added a commentGravatar http://joeyh.name/2012-12-10
| | |
| * | fix PATHGravatar Joey Hess2012-12-10
| | |
* | | updateGravatar Joey Hess2012-12-10
| | |
* | | Merge branch 'master' into desymlinkGravatar Joey Hess2012-12-10
|\| |
| * | update list of things TODO to make git annex sync work in direct modeGravatar Joey Hess2012-12-10
| | |
* | | direct mode mappings now updated by git annex syncGravatar Joey Hess2012-12-10
| | | | | | | | | | | | | | | Still lots to do to make sync handle direct mode, but this is a good first step.
* | | git diff-tree interfaceGravatar Joey Hess2012-12-10
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-12-10
| | |