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

5 files changed, 87 insertions, 0 deletions

diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist.mdwn b/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist.mdwn
new file mode 100644
index 000000000..332ea4357
--- /dev/null
+++ b/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist.mdwn
@@ -0,0 +1,25 @@
+### Please describe the problem.
+
+git annex direct displays warnings(?)
+### What steps will reproduce the problem?
+    mkdir test
+    cd test
+    git init
+    git annex init
+    touch foobar.txt
+    git annex add
+    git annex direct
+
+
+### What version of git-annex are you using? On what operating system?
+5.20140717 (ubuntu 14.10)
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/forum/Copying_and_dropping_right_after/comment_2_87a14d14014aefc33f811bb15ea27e13._comment b/doc/forum/Copying_and_dropping_right_after/comment_2_87a14d14014aefc33f811bb15ea27e13._comment
new file mode 100644
index 000000000..b58b61a75
--- /dev/null
+++ b/doc/forum/Copying_and_dropping_right_after/comment_2_87a14d14014aefc33f811bb15ea27e13._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4"
+ nickname="Florian"
+ subject="comment 2"
+ date="2015-01-14T22:01:24Z"
+ content="""
+Sorry for the late reply. I had redone my git-annex repos, but I just had exactly this behaviour again
+
+    % git annex wanted astarte
+    standard 
+    % git annex group astarte 
+    transfer
+
+Best Regards...
+"""]]
diff --git a/doc/forum/git_annex_assistant_repository_history__63__.mdwn b/doc/forum/git_annex_assistant_repository_history__63__.mdwn
new file mode 100644
index 000000000..d357b7887
--- /dev/null
+++ b/doc/forum/git_annex_assistant_repository_history__63__.mdwn
@@ -0,0 +1,7 @@
+Hi,
+
+Even after googling for a while, I'm still having a hard time finding an answer for this:
+
+How can I access the revision history information for an annex-assistant repository?  For example, to recover a file on one computer that another computer deleted.  Or, to view how another computer modified a file.
+
+Thanks!
diff --git a/doc/forum/how_to_prevent_accidentally_running___96__git_add__96____63__/comment_4_bfb4758fdb2a4afafd9c4d45de5c5c6b._comment b/doc/forum/how_to_prevent_accidentally_running___96__git_add__96____63__/comment_4_bfb4758fdb2a4afafd9c4d45de5c5c6b._comment
new file mode 100644
index 000000000..de2a279a7
--- /dev/null
+++ b/doc/forum/how_to_prevent_accidentally_running___96__git_add__96____63__/comment_4_bfb4758fdb2a4afafd9c4d45de5c5c6b._comment
@@ -0,0 +1,28 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg"
+ nickname="Bence"
+ subject="comment 4"
+ date="2015-01-15T16:15:21Z"
+ content="""
+Based on the above, I'm using this script in the `pre-commit` hook.
+
+It gets the staged files and checks if they are links or not. If a file being committed is not a link (maybe it was added with `git add filename` ???), the script aborts the commit.
+
+    #!/bin/sh
+    
+    # Don't allow files to be added to the normal repo.
+    stagedfiles=$(git diff --cached --name-only);
+    echo \"$stagedfiles\" | while IFS= read -r file; do
+    	if [ ! -L \"$file\" ]; then
+    		echo \"[Error] The file \\"$file\\" should not be added to the repo.\";
+    		echo \"#Remove from the index and add with git-annex:\";
+    		echo \"\$ git rm --cached \\"$file\\" && git annex add \\"$file\\"\";
+    		exit 1;
+    	#else
+    	#	echo \"OK : $file\";
+    	fi;
+    done;
+    
+    # automatically configured by git-annex
+    git annex pre-commit .
+"""]]
diff --git a/doc/scalability/comment_1_a6656ae397277719d67d0953a28fe1d8._comment b/doc/scalability/comment_1_a6656ae397277719d67d0953a28fe1d8._comment
new file mode 100644
index 000000000..5c0038e80
--- /dev/null
+++ b/doc/scalability/comment_1_a6656ae397277719d67d0953a28fe1d8._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmiPEySoakXDQ4OUAmC9neEOZW17W1KvlU"
+ nickname="Francesco Saverio"
+ subject="Default value of annex.queuesize"
+ date="2015-01-14T15:45:46Z"
+ content="""
+What is the default value of :
+
+    annex.queuesize 
+
+Without knowing the default value it is impossible to increase it :) thank you
+"""]]