mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2013-03-07 19:06:29 -04:00
commit 4713c2fdac
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
doc/bugs/Switching_between_direct_and_indirect_stomps_on___39__regular__39___git_files.mdwn Normal file
View file

@ -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

12
doc/forum/git-remote-gcrypt/comment_1_175c8c35d9bbb470fcc17697eb8cc6b8._comment Normal file
View file

@ -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.
"""]]