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

This commit is contained in:
Joey Hess 2014-05-29 14:23:16 -04:00
commit 3c5b052142
2 changed files with 18 additions and 0 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.176"
subject="comment 1"
date="2014-05-29T18:21:30Z"
content="""
As far as I can understand the description (which has an lot of different \"foo\"'s in it that seem to refer to different things?) -- This is the assistant behaving as designed: Any time two repositories are pointed at the same transfer repository, or removable drive repository, etc, they will unify and share all their files.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.176"
subject="comment 1"
date="2014-05-29T18:15:12Z"
content="""
That extra git-annex- prefix is used in ~/.ssh/config to set up the ssh keys for the repository. So it's normal.
I suggest that you try running git-annex sync at the command line and paste the output so we can see how it fails.
"""]]