summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-06
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-06
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-06
| | |
| * | rename bugs/GPG_errors_under_OS_10.9_Mavericks.mdwn to ↵Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-06
| | | | | | | | | | | | bugs/Mac_OS_10.9_GPG_error_adding_S3_repo.mdwn
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-06
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2013-11-06
| | |
| * | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM2013-11-06
|/ /
* | updateGravatar Joey Hess2013-11-06
| |
| * updateGravatar Joey Hess2013-11-06
| |
| * fix mergeGravatar Joey Hess2013-11-06
| |
| * Merge branch 'master' into directguardGravatar Joey Hess2013-11-06
| |\ | |/ |/|
* | add news item for git-annex 4.201311064.20131106Gravatar Joey Hess2013-11-06
| |
* | Added a commentGravatar http://joeyh.name/2013-11-06
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-06
|\ \
* | | typoGravatar Joey Hess2013-11-06
| | |
| * | Added a commentGravatar http://joeyh.name/2013-11-06
| | |
* | | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-06
|\| |
| * | Added a commentGravatar http://joeyh.name/2013-11-06
| | |
| * | lots more details and screenshotsGravatar https://id.koumbit.net/anarcat2013-11-06
| | |