diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-26 14:55:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-26 14:55:11 -0400 |
| commit | ff3f431794d2fd6e1754d70f3e316327fc95ae09 (patch) | |
| tree | 3e0cd8fc76ee052acee41db7250e135843291c2d | |
| parent | 553ed7fc4e16e6bc52b86e3324e9e1d7f9bd18c8 (diff) | |
| parent | 893d8ea19df7292a03d9b570816519841b8f7448 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
4 files changed, 39 insertions, 0 deletions
diff --git a/doc/bugs/S3_remote___8212___un-embedding_creds__63__/comment_2_282aaaed5e95e8062460f94ac3a68dea._comment b/doc/bugs/S3_remote___8212___un-embedding_creds__63__/comment_2_282aaaed5e95e8062460f94ac3a68dea._comment new file mode 100644 index 000000000..9c2e141f3 --- /dev/null +++ b/doc/bugs/S3_remote___8212___un-embedding_creds__63__/comment_2_282aaaed5e95e8062460f94ac3a68dea._comment @@ -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. =) +"""]] diff --git a/doc/forum/Merging_two_git-annex_repositories_together__63__.mdwn b/doc/forum/Merging_two_git-annex_repositories_together__63__.mdwn new file mode 100644 index 000000000..fb3c9d01e --- /dev/null +++ b/doc/forum/Merging_two_git-annex_repositories_together__63__.mdwn @@ -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! diff --git a/doc/forum/Merging_two_git-annex_repositories_together__63__/comment_1_b96bb95cdbbc78c0b4b348861e2264bd._comment b/doc/forum/Merging_two_git-annex_repositories_together__63__/comment_1_b96bb95cdbbc78c0b4b348861e2264bd._comment new file mode 100644 index 000000000..46be89f73 --- /dev/null +++ b/doc/forum/Merging_two_git-annex_repositories_together__63__/comment_1_b96bb95cdbbc78c0b4b348861e2264bd._comment @@ -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! +"""]] diff --git a/doc/forum/Merging_two_git-annex_repositories_together__63__/comment_2_539a33b268be5c6954f3112d89dd34ef._comment b/doc/forum/Merging_two_git-annex_repositories_together__63__/comment_2_539a33b268be5c6954f3112d89dd34ef._comment new file mode 100644 index 000000000..5059bc45d --- /dev/null +++ b/doc/forum/Merging_two_git-annex_repositories_together__63__/comment_2_539a33b268be5c6954f3112d89dd34ef._comment @@ -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! +"""]] |