summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-09 16:14:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-09 16:14:17 -0400
commit6ce83deaae6f0db7630bf9dbb7445a0cffc3feb7 (patch)
treeed4b5ebc88bbe2a5f9716bd8afe7f3257ecbf87b
parentdebc167c82842a7a9ba57ebfec227dc397fc0f1b (diff)
parent82eef1e6c7ce1a1c0ec904aadb426ffc7100d72e (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/__40__assistant__41___dependency_on_ssh-askpass_-_not_installed_automatically_on_xubuntu/comment_1_f4656f8a0f36535def0772db06098c5f._comment13
-rw-r--r--doc/forum/Share_only_certain_files_of_a_repo___40__Assistant__41__/comment_1_ec0d56cb31b918023a9184cee168b406._comment8
-rw-r--r--doc/forum/git-annex:_status:_1_failed/comment_1_c235cc83c75474e6393e08d2d94b119d._comment10
3 files changed, 31 insertions, 0 deletions
diff --git a/doc/bugs/__40__assistant__41___dependency_on_ssh-askpass_-_not_installed_automatically_on_xubuntu/comment_1_f4656f8a0f36535def0772db06098c5f._comment b/doc/bugs/__40__assistant__41___dependency_on_ssh-askpass_-_not_installed_automatically_on_xubuntu/comment_1_f4656f8a0f36535def0772db06098c5f._comment
new file mode 100644
index 000000000..34a2ed325
--- /dev/null
+++ b/doc/bugs/__40__assistant__41___dependency_on_ssh-askpass_-_not_installed_automatically_on_xubuntu/comment_1_f4656f8a0f36535def0772db06098c5f._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.255.110"
+ subject="comment 1"
+ date="2013-09-09T20:08:57Z"
+ content="""
+It's not a dependency. It's a recommends.
+
+apt does not install new recommends that get added to a package. Adding that recommends only causes it to be installed by default when new users install the package
+
+This seems to be the best I can do, short of adding a separate git-annex-assistant package, which could depend on ssh-askpass.
+Might not be a bad idea..
+"""]]
diff --git a/doc/forum/Share_only_certain_files_of_a_repo___40__Assistant__41__/comment_1_ec0d56cb31b918023a9184cee168b406._comment b/doc/forum/Share_only_certain_files_of_a_repo___40__Assistant__41__/comment_1_ec0d56cb31b918023a9184cee168b406._comment
new file mode 100644
index 000000000..8fa6f7b40
--- /dev/null
+++ b/doc/forum/Share_only_certain_files_of_a_repo___40__Assistant__41__/comment_1_ec0d56cb31b918023a9184cee168b406._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.255.110"
+ subject="comment 1"
+ date="2013-09-09T19:44:57Z"
+ content="""
+Everyone can see the names of every file that is put into the git repository. Whether the contents of those files is transferred from the machine where they were created to other clones of the repository is configurable using [[preferred_content]], but it's not really intended as an access control mechanism.
+"""]]
diff --git a/doc/forum/git-annex:_status:_1_failed/comment_1_c235cc83c75474e6393e08d2d94b119d._comment b/doc/forum/git-annex:_status:_1_failed/comment_1_c235cc83c75474e6393e08d2d94b119d._comment
new file mode 100644
index 000000000..a5a378c99
--- /dev/null
+++ b/doc/forum/git-annex:_status:_1_failed/comment_1_c235cc83c75474e6393e08d2d94b119d._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.255.110"
+ subject="comment 1"
+ date="2013-09-09T19:38:50Z"
+ content="""
+You might try moving the .git/annex/transfer/ directory out of the way.
+
+What version of git-annex do you have installed?
+"""]]