summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Include ssh-keygen in standalone bundle.Gravatar Joey Hess2013-11-08
|
* fixedGravatar Joey Hess2013-11-08
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-08
|\
* | closeGravatar Joey Hess2013-11-08
| |
| * Added a commentGravatar http://joeyh.name/2013-11-08
| |
| * Added a commentGravatar http://joeyh.name/2013-11-08
| |
| * Added a commentGravatar http://joeyh.name/2013-11-08
| |
| * Added a commentGravatar http://joeyh.name/2013-11-08
| |
| * Added a comment: measuring how-toGravatar https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio2013-11-08
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-07
|\
* | devblogGravatar Joey Hess2013-11-07
| |
* | webapp: Improve UI around remote that have no annex.uuid set, either because ↵Gravatar Joey Hess2013-11-07
| | | | | | | | | | | | | | | | setup of them is incomplete, or because the remote git repository is not a git-annex repository. Complicated by such repositories potentially being repos that should have an annex.uuid, but it failed to be gotten, perhaps due to the past ssh repo setup bugs. This is handled now by an Upgrade Repository button.
| * Added a comment: Still fails with git-annex version 4.20131105-g136b030Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-07
| |
| * Added a comment: Updated version 4.20131105-g136b030 seems to workGravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-07
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o2013-11-07
| |
| * Added a comment: Comment 2Gravatar Frank2013-11-07
|/
* webapp: Avoid encoding problems when displaying the daemon log file.Gravatar Joey Hess2013-11-07
|
* improve docsGravatar Joey Hess2013-11-07
|
* watcher: Avoid loop when adding a file owned by someone else fails in ↵Gravatar Joey Hess2013-11-07
| | | | | | | | indirect mode because its permissions cannot be modified. Adding the file moved it to the annex, and then tried to set the mode. Error unwind then moved the file back, and so the watcher saw the file get deleted and then added back, and so tried again..
* sync: When there are merge conflicts that get automatically resolved, exit ↵Gravatar Joey Hess2013-11-07
| | | | nonzero at the end.
* no status in bare repoGravatar Joey Hess2013-11-07
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-07
|\
* | remove some old comments about safety of git working tree commands in direct ↵Gravatar Joey Hess2013-11-07
| | | | | | | | mode
* | updateGravatar Joey Hess2013-11-07
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n482013-11-07
| |
| * Added a commentGravatar http://joeyh.name/2013-11-07
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-07
|\
* \ Merge branch 'directguard'Gravatar Joey Hess2013-11-07
|\ \
| | * Added a commentGravatar http://joeyh.name/2013-11-07
| | |
* | | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-07
|\ \ \ | | |/ | |/|
| | * add new status commandGravatar Joey Hess2013-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works for both direct and indirect mode. It may need some performance tuning. Note that unlike git status, it only shows the status of the work tree, not the status of the index. So only one status letter, not two .. and since files that have been added and not yet committed do not differ between the work tree and the index, they are not shown. Might want to add display of the index vs the last commit eventually. This commit was sponsored by an unknown bitcoin contributor, whose contribution as been going up lately! ;)
| | * rename status to info, and update docsGravatar Joey Hess2013-11-07
| | |
| * | Added a commentGravatar http://joeyh.name/2013-11-07
| | |
* | | one more git-remote-gcrypt refGravatar Joey Hess2013-11-07
| | |
| * | Added a commentGravatar http://joeyh.name/2013-11-07
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n482013-11-07
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o2013-11-07
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o2013-11-07
| | |
| * | removedGravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-07
| | |
| * | Added a comment: Update git-annex seems to workGravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-07
| | |
| * | Added a comment: OS X buildsGravatar https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec892013-11-07
| | |
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n482013-11-06
| | |
| * | Added a commentGravatar http://joeyh.name/2013-11-06
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n482013-11-06
| | |
| * | Added a comment: S3 works without encryptionGravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-06
|/ /
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-06
|\ \
* | | sponsorGravatar Joey Hess2013-11-06
| | |
* | | devblogGravatar Joey Hess2013-11-06
| | |
* | | Allow optionally configuring git-annex with -fEKG to enable awesome remote ↵Gravatar Joey Hess2013-11-06
| | | | | | | | | | | | monitoring interfaceat http://localhost:4242/
| | * adjust test suite to work with and test direct mode guardGravatar Joey Hess2013-11-06
| | |