mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2013-05-01 21:10:12 -04:00
commit 1c27eaa720
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/design/assistant/blog/day_251__xmpp_improvements.mdwn
View file

@ -3,7 +3,7 @@ since February, or possibly earlier, not counting trips. Whoops!
Also, I was feeling overwhelmed with the complexity of fixing XMPP to not Also, I was feeling overwhelmed with the complexity of fixing XMPP to not
be buggy when there are multiple separate repos using the same XMPP be buggy when there are multiple separate repos using the same XMPP
account. Let my subconcious work on that, and last night it served up the account. Let my subconscious work on that, and last night it served up the
solution, in detail. Built it today. solution, in detail. Built it today.
It's only a partial solution, really. If you want to use the same XMPP It's only a partial solution, really. If you want to use the same XMPP
@ -21,7 +21,7 @@ Before, it would merge them all together without warning.
---- ----
While I was testing that, I think I found out the real reason why XMPP While I was testing that, I think I found out the real reason why XMPP
pushes have seemed a little unrelaible. It turns out to not be an XMPP pushes have seemed a little unreliable. It turns out to not be an XMPP
issue at all! Instead, the merger was simply not always issue at all! Instead, the merger was simply not always
noticing when `git receive-pack` updated a ref, and not merging it into noticing when `git receive-pack` updated a ref, and not merging it into
master. That was easily fixed. master. That was easily fixed.

3
doc/forum/webapp_listen_port_with_autostart.mdwn Normal file
View file

@ -0,0 +1,3 @@
To start the webapp on a X-less server it's possible to use the parameter `--listen` and then connect from a client with X to it.
How can I start the webapp on all annex repos on this server like on a client with `assistant --autostart`? Would be nice to start the assistant on all configured repos which listens on a defined port, f.e. `git annex assistant --autostart --listen 0.0.0.0:8888`. It would be even nicer to have a parameter to chose a autostart configuration file, f.e. `git annex assistant --autostart --autostart-config /etc/git-annex/autostart --listen 0.0.0.0:8888`, so this could end up in a real server application, a init script would be easy to write...

8
doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_5_4114380f66b6376c851e93f6876d590b._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo"
nickname="Tobias"
subject="mimetypes"
date="2013-05-01T20:37:33Z"
content="""
Does `annex.largefiles` support mimetypes? F.e. `git config annex.largefiles \"not mimetype=text/plain\"`
"""]]