diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-01-13 18:13:57 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-01-13 18:13:57 -0400 |
commit | 507b05d294846c2680795e8bc4201f7669fe49f5 (patch) | |
tree | 8e3a76a771229f9b727464b4eb35c0ec26b0a97c | |
parent | de9ead9b92091e07795acf003dc05adb6912f15c (diff) | |
parent | 45a7098b54dc86046bf00ef0a54609a8d86172b9 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
3 files changed, 10 insertions, 12 deletions
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index e557ba253..9a81accd7 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -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 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/"]] diff --git a/doc/news/version_5.20150113/comment_1_e1da6b6d532d8eb08373347de3a4f7ec._comment b/doc/news/version_5.20150113/comment_1_e1da6b6d532d8eb08373347de3a4f7ec._comment new file mode 100644 index 000000000..952865509 --- /dev/null +++ b/doc/news/version_5.20150113/comment_1_e1da6b6d532d8eb08373347de3a4f7ec._comment @@ -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! +"""]] diff --git a/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment b/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment deleted file mode 100644 index 2c68f7e2e..000000000 --- a/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment +++ /dev/null @@ -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. -"""]] |