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 2015-01-13 18:13:57 -04:00
commit 150220de65
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/design/assistant/polls/Android_default_directory.mdwn
View file

@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they
want the first time they run it, but to save typing on android, anything want the first time they run it, but to save typing on android, anything
that gets enough votes will be included in a list of choices as well. that gets enough votes will be included in a list of choices as well.
[[!poll open=yes expandable=yes 71 "/sdcard/annex" 6 "Whole /sdcard" 7 "DCIM directory (photos and videos only)" 2 "Same as for regular git-annex. ~/annex/"]] [[!poll open=yes expandable=yes 72 "/sdcard/annex" 6 "Whole /sdcard" 7 "DCIM directory (photos and videos only)" 2 "Same as for regular git-annex. ~/annex/"]]

9
doc/news/version_5.20150113/comment_1_e1da6b6d532d8eb08373347de3a4f7ec._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="anarcat"
subject="comment 1"
date="2015-01-13T18:09:52Z"
content="""
> * sync: Fix an edge case where syncing in a bare repository would try to merge and so fail.
i think i just saw that bug yesterday, glad to see it fixed so quickly!
"""]]

11
doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment
View file

@ -1,11 +0,0 @@
[[!comment format=mdwn
username="eeerky"
subject="shared keys?"
date="2015-01-13T15:24:25Z"
content="""
I'm not sure if I'm misreading this walkthrough, but does prefixing your key in authorize_keys file mean that the specific key pair can only be used in conjunction with git annex?
In other words, if I wish to have one key pair between my laptop and server, could I use that one key pair for both git-annex and simple shell access?
What I'm seeing now is that the path to my **git-annex-shell** script is correct, but my server goes into high cpu and doesn't let me login when I try sshing into it.
"""]]