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

doc/bugs/forget_corrupts_non-ascii_chars/comment_1_fc8a4a93be2c234567836a4acee90957._comment

@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ ip="72.0.72.144"
+ subject="comment 1"
+ date="2014-05-16T14:36:09Z"
+ content="""
+this eventually completely breaks with:
+
+[[!format txt \"\"\"
+anarcat@marcos:video$ git annex info --fast
+repository mode: indirect
+trusted repositories: 2
+        31912b57-62a5-475c-87a7-582b5492a216 -- WD green 1.5TB backup drive
+        5adbab10-0f7a-467b-b0d8-5d7af2223103 -- here (main (anarcat@marcos:/srv/video))
+semitrusted repositories: 5
+        00000000-0000-0000-0000-000000000001 -- web
+        2d594c02-9164-4ebd-ac47-f8cdc9c16e2f -- rachel@topcrapn:~/Vid
+git-annex: <stdout>: commitBuffer: invalid argument (invalid character)
+failed
+git-annex: info: 1 failed
+\"\"\"]]
+"""]]

doc/bugs/git-annex_ignores_GIT__95__SSH/comment_1_958dd21d7e981232f03b4516521ac226._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T16:42:41Z"
+ content="""
+This is good spotting of a git configuration that git-annex does not support.
+
+However, I doubt that even if I made it use `GIT_SSH`, it would be useful. git-annex uses several features that are probably unique to openssh, including connection caching. While you could disable annex.sshcaching and perhaps get a different ssh to work, it would be much slower.
+"""]]

doc/forum/Git-Annex_with_Asustor_NAS/comment_1_44445200e5b716caeec225972a5d5dce._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T16:32:05Z"
+ content="""
+If your NAS is accessed over SSH, it is not a removably drive, clearly.
+
+Try starting git-annex webapp from a console, you will probably see the ssh password prompt there. Or, install ssh-askpass, or, install a current daily build of git-annex, which will prompt for the ssh password from within the webapp.
+"""]]

doc/forum/How_to_change_the_name_of_a_repo_on_S3__63__/comment_1_be74d63e1951f515948d232e096b4862._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T16:28:40Z"
+ content="""
+If you look at the [[S3_documentation|special_remotes/S3]] you will see a `bucket` setting that does what you want. You can use `git annex enableremote` to change it.
+"""]]

doc/forum/git-annex:_map:_1_failed/comment_1_35ff3256e823ab8cfc53276a2123ad5f._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T16:29:54Z"
+ content="""
+`dot` is a command from the graphviz package. Perhaps you do not have it installed.
+"""]]

doc/forum/warning:_remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_2_c28dae2eb0ab825ee6d43735e04a18a3._comment

@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 2"
+ date="2014-05-16T16:49:09Z"
+ content="""
+After you add a file to a git repository, you have to git commit it. Using git-annex is no different. The walkthrough shows using `git commit`: <http://git-annex.branchable.com/walkthrough/adding_files/>; you can use `git-annex sync` if you prefer.
+
+<pre>
+Permission denied (publickey,keyboard-interactive).
+ (merging origin/git-annex origin/synced/git-annex into git-annex...)
+ (Recording state in git...)
+
+   Remote origin does not have git-annex installed; setting annex-ignore
+</pre>
+
+git-annex uses a heuristic to determine if git-annex-shell is not installed on a remote server: It tries to run it, and if that fails, it tries to run git fetch. If that succeeds it assumes this means it can log into the server, but git-annex-shell is not installed.
+
+Above, that heuristic seems to have failed; you seem to have given the wrong password or something so it didn't run git-annex-shell, but then it was able to log in for the git fetch. 
+
+You will need to run this command to fix it up: `git config origin.annex-ignore false`
+"""]]

doc/tips/skydriveannex/comment_2_1f747018b35ab8accd2bf0905e6ad926._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 2"
+ date="2014-05-16T16:26:50Z"
+ content="""
+The assistant will use any repositories you set up, no matter how you set them up.
+"""]]

doc/todo/Allow_syncing_only_selected_branches/comment_2_46d27fe74b4adac2e740fa555f549459._comment

@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 2"
+ date="2014-05-16T08:40:47Z"
+ content="""
+Joey, thanks for clearing that up. In my test-case I only had two
+branches, and I mistook it for pushing everything. Actually, what I
+wanted to achieve was the following:
+
+Have a main repo M with branches A and A-downstream, and have a
+downstream repo D with just A-downstream. What confused me was that
+the main repo always pushed A to D. I suppose if I just have the two
+branches, I would achieve the desired effect by not using «annex
+sync», and instead just pushing the git-annex branch manually; would
+that be the way to go?
+
+"""]]

doc/todo/windows_support/comment_13_59fbe4d07cdbeb786bae792f9c709ddd._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://johan.kiviniemi.name/"
+ nickname="Johan"
+ subject="comment 13"
+ date="2014-05-16T02:27:51Z"
+ content="""
+“The tricky part is that multiple git-annex assistant processes can be running, if there are multiple local repositories.”
+
+This would probably mean a lot of work, but it might be nice if there was just a single git-annex assistant per user which could take care of multiple local repos. The UI would be nicer, too, since the status of and notifications from every repository could be shown in the same place.
+"""]]