diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-13 13:40:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-13 13:40:56 -0400 |
| commit | 00a4380a5a02290251b70a5bee29626453ffd344 (patch) | |
| tree | 5921c5b661815ca61d91aaf1b849cdb83616ad2f /doc | |
| parent | 8b07cc3ede1099f6b18d90c1c51ab12bffaffebf (diff) | |
| parent | d14c07acc1de6f2c33ab92076048e40bbcaf517b (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
3 files changed, 28 insertions, 0 deletions
diff --git a/doc/assistant/local_pairing_walkthrough/comment_8_b9d4c29cf2cca0427808df6af08fb789._comment b/doc/assistant/local_pairing_walkthrough/comment_8_b9d4c29cf2cca0427808df6af08fb789._comment new file mode 100644 index 000000000..31a0f9674 --- /dev/null +++ b/doc/assistant/local_pairing_walkthrough/comment_8_b9d4c29cf2cca0427808df6af08fb789._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + nickname="joey" + subject="comment 8" + date="2013-05-13T17:22:17Z" + content=""" +I don't understand how IPv6 could affect local pairing. The assistant does not currently do pairing over ipv6 due to a limitation in the multicast library it's using. +"""]] diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_1_7f54e24c8e721d69bdb1e5a4181641b8._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_1_7f54e24c8e721d69bdb1e5a4181641b8._comment new file mode 100644 index 000000000..45eebe10f --- /dev/null +++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_1_7f54e24c8e721d69bdb1e5a4181641b8._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + nickname="joey" + subject="comment 1" + date="2013-05-13T17:36:31Z" + content=""" +It's a fairly fundamental limitation of git that you cannot check `.git` directories into a git repository. + +For backups and sneakernet transfers, `git bundle` is easy to use.. +"""]] diff --git a/doc/forum/Accessing_files_in_bare_repository/comment_11_f0165d66865ad14f7eb5d50e900c1df4._comment b/doc/forum/Accessing_files_in_bare_repository/comment_11_f0165d66865ad14f7eb5d50e900c1df4._comment new file mode 100644 index 000000000..abacbc30e --- /dev/null +++ b/doc/forum/Accessing_files_in_bare_repository/comment_11_f0165d66865ad14f7eb5d50e900c1df4._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + nickname="joey" + subject="comment 11" + date="2013-05-13T17:33:26Z" + content=""" +When the assistant (or git annex sync) pushes to a repository, it creates a `synced/master` branch. So your bare repository has no regular `master` branch. So when you clone it, you get a repository with no branch checked out, which is what git-annex sync complains about. + +There are several solutions. The easiest is to run `git merge origin/synced/master`; then your checkout will have a master branch and you can use `git annex sync` from then on. +"""]] |