diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-07 19:06:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-07 19:06:29 -0400 |
| commit | d56440dd6bf86ffc612bec2fdf545e02ae79f991 (patch) | |
| tree | 7e3cc886a50f7bb5e7b872816b687ba83a8113b9 | |
| parent | c25b0262ea2a7322f8d2ef8aa12db05c5e5e2d1f (diff) | |
| parent | ae463b19a57c3128679775a9a0821c6b84412ebc (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/bugs/Switching_between_direct_and_indirect_stomps_on___39__regular__39___git_files.mdwn | 24 | ||||
| -rw-r--r-- | doc/forum/git-remote-gcrypt/comment_1_175c8c35d9bbb470fcc17697eb8cc6b8._comment | 12 |
2 files changed, 36 insertions, 0 deletions
diff --git a/doc/bugs/Switching_between_direct_and_indirect_stomps_on___39__regular__39___git_files.mdwn b/doc/bugs/Switching_between_direct_and_indirect_stomps_on___39__regular__39___git_files.mdwn new file mode 100644 index 000000000..0c40c57d2 --- /dev/null +++ b/doc/bugs/Switching_between_direct_and_indirect_stomps_on___39__regular__39___git_files.mdwn @@ -0,0 +1,24 @@ +# What steps will reproduce the problem? + + git add file + git annex add file2 + git annex direct + git annex indirect + +file and file2 are now both in the annex. + +# What is the expected output? What do you see instead? + +file should remain in the main repo, file2 should remain in the annex + +# What version of git-annex are you using? On what operating system? + + git-annex version: 4.20130228 + local repository version: 3 + default repository version: 3 + supported repository versions: 3 4 + upgrade supported from repository versions: 0 1 2 + + git version 1.8.1.5 + +Mac OSX 10.8.2 Build 12C60 diff --git a/doc/forum/git-remote-gcrypt/comment_1_175c8c35d9bbb470fcc17697eb8cc6b8._comment b/doc/forum/git-remote-gcrypt/comment_1_175c8c35d9bbb470fcc17697eb8cc6b8._comment new file mode 100644 index 000000000..ca38da4cd --- /dev/null +++ b/doc/forum/git-remote-gcrypt/comment_1_175c8c35d9bbb470fcc17697eb8cc6b8._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + nickname="joey" + subject="comment 1" + date="2013-03-07T18:42:37Z" + content=""" +I have not put it on the schedule (and don't think I'll get to it this month), but I have added it to the [[roadmap|design/assistant]]. + +The main use cases it adds are encrypting git remotes on ssh servers, and on USB drives. Both are useful for sure.. + +It also opens the possibility of using github for encrypted git remotes, but with xmpp git push that is not a pressing use case. With significantly more work, encrypted git remotes could be stored on S3 etc, but again xmpp git push covers the same use cases. +"""]] |