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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Joey Hess 2012-05-30 17:06:48 -04:00
commit 7c962e76b4
6 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/design/assistant/android.mdwn
View file

@ -32,7 +32,7 @@ Not ideal.
#### implement git smudge filters
See [[smudge]].
See [[todo/smudge]].
Difficult. Would make git-annex generally better.

8
doc/forum/Getting_started_with_Amazon_S3/comment_2_e90aa3259d9a12cd67daa27d42d69ab5._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY"
nickname="Matt"
subject="comment 2"
date="2012-05-30T00:40:45Z"
content="""
It's strange. I've done some testing on another machine, and this one, and the issue seems to be with adding only certain sub-directories of the git-annex directory. Would it cause an issue with git-annex if a sub-directory was a git repo?
"""]]

8
doc/forum/Getting_started_with_Amazon_S3/comment_3_c3adce7c0f29e71ed9dd07103ede2c1a._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.81.112"
subject="comment 3"
date="2012-05-30T00:54:38Z"
content="""
If the subdirectory has a .git, then it's a separate git repo, and inside the directory, all git (and git-annex) commands in it will operate on that nested repo and ignore the outside one.
"""]]

4
doc/special_remotes/S3.mdwn
View file

@ -6,8 +6,8 @@ See [[tips/using_Amazon_S3]] and
## configuration
The standard environment variables `AWS_S3_ACCESS_KEY_ID` and
`AWS_S3_SECRET_ACCESS_KEY` are used to supply login credentials
The standard environment variables `AWS_ACCESS_KEY_ID` and
`AWS_SECRET_ACCESS_KEY` are used to supply login credentials
for Amazon. When encryption is enabled, they are stored in encrypted form
by `git annex initremote`, so you do not need to keep the environment
variables set after the initial initalization of the remote.

8
doc/special_remotes/S3/comment_3_bcab2bd0f168954243aa9bcc9671bd94._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY"
nickname="Matt"
subject="comment 3"
date="2012-05-30T00:26:33Z"
content="""
Thanks! Being new here, I didn't want to overstep my boundaries. I've gone ahead and made a small edit and will do so elsewhere as needed.
"""]]

4
doc/tips/using_Amazon_S3.mdwn
View file

@ -4,8 +4,8 @@ Amazon S3, and use git-annex to transfer files into the cloud.
First, export your S3 credentials:
# export AWS_S3_ACCESS_KEY_ID="08TJMT99S3511WOZEP91"
# export AWS_S3_SECRET_ACCESS_KEY="s3kr1t"
# export AWS_ACCESS_KEY_ID="08TJMT99S3511WOZEP91"
# export AWS_SECRET_ACCESS_KEY="s3kr1t"
Now, create a gpg key, if you don't already have one. This will be used
to encrypt everything stored in S3, for your privacy. Once you have