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

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

Browse source
This commit is contained in:
Joey Hess 2017-02-26 14:55:11 -04:00
commit 5e24e3ffe7
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 39 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/bugs/S3_remote___8212___un-embedding_creds__63__/comment_2_282aaaed5e95e8062460f94ac3a68dea._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="michalrus"
avatar="http://cdn.libravatar.org/avatar/83c0b6e7f9d20f09a892263c4903bbae"
subject="comment 2"
date="2017-02-25T18:47:35Z"
content="""
Sure, that’s what I did at the very beginning (revoking the creds on AWS).
But still, when I clone this repo, `git annex info S3` in this fresh clone, says that credentials are embedded. This is a bit misleading.
Maybe updating S3 configuration with `embedcreds=no` could change that behavior?
It wouldn’t matter from the security standpoint (which is solved by changing permissions directly on AWS), but would simply be beneficial for usability. =)
"""]]

7
doc/forum/Merging_two_git-annex_repositories_together__63__.mdwn Normal file
View file

@ -0,0 +1,7 @@
Hello!
I’ve got two repos, both are using git-annex.
Can I somehow merge them together, into one?
Thank you!

8
doc/forum/Merging_two_git-annex_repositories_together__63__/comment_1_b96bb95cdbbc78c0b4b348861e2264bd._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="openmedi"
avatar="http://cdn.libravatar.org/avatar/563ffaff3b492c579bd8f094472e4506"
subject="comment 1"
date="2017-02-25T20:35:52Z"
content="""
I think you could add those two repositories as remotes of each other and merge them with the `--allow-unrelated-histories` option. But I'm not sure if this is a good idea, or not. But some googling in that direction might yield some useful information. Good luck!
"""]]

10
doc/forum/Merging_two_git-annex_repositories_together__63__/comment_2_539a33b268be5c6954f3112d89dd34ef._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="michalrus"
avatar="http://cdn.libravatar.org/avatar/83c0b6e7f9d20f09a892263c4903bbae"
subject="comment 2"
date="2017-02-26T00:59:21Z"
content="""
No, actually everything just works. ♥
It’s amazing! Thank you!
"""]]