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

4 files changed, 46 insertions, 0 deletions

diff --git a/doc/devblog/day_82__rpi_and_synology/comment_1_d154ddcf22027fd06acf9da73e12c006._comment b/doc/devblog/day_82__rpi_and_synology/comment_1_d154ddcf22027fd06acf9da73e12c006._comment
new file mode 100644
index 000000000..9b73a8e79
--- /dev/null
+++ b/doc/devblog/day_82__rpi_and_synology/comment_1_d154ddcf22027fd06acf9da73e12c006._comment
@@ -0,0 +1,8 @@
+[[!comment format=txt
+ username="Attila"
+ ip="213.163.19.162"
+ subject="git-annex.org"
+ date="2013-12-27T14:14:07Z"
+ content="""
+Minor glitch on git-annex.org: the first link to http://git-annex.branchable.com is missing http:// prefix and so points to http://www.git-annex.org/git-annex.branchable.com
+"""]]
diff --git a/doc/devblog/day_86__external_special_remote_implementation/comment_1_5116bcf4b60030cb46683df94a75d7ee._comment b/doc/devblog/day_86__external_special_remote_implementation/comment_1_5116bcf4b60030cb46683df94a75d7ee._comment
new file mode 100644
index 000000000..358062308
--- /dev/null
+++ b/doc/devblog/day_86__external_special_remote_implementation/comment_1_5116bcf4b60030cb46683df94a75d7ee._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawleVyKk2kQsB_HgEdS7w1s0BmgRGy1aay0"
+ nickname="Milan"
+ subject="comment 1"
+ date="2013-12-27T08:44:44Z"
+ content="""
+Will it support splitting of large files for remotes that limits size of stored file?
+"""]]
diff --git a/doc/forum/No_output_from_git-annex_status_v5.20131224-g692aa01/comment_3_decd893fab265d0d0dc8c20f6a70d8e4._comment b/doc/forum/No_output_from_git-annex_status_v5.20131224-g692aa01/comment_3_decd893fab265d0d0dc8c20f6a70d8e4._comment
new file mode 100644
index 000000000..74e2a89da
--- /dev/null
+++ b/doc/forum/No_output_from_git-annex_status_v5.20131224-g692aa01/comment_3_decd893fab265d0d0dc8c20f6a70d8e4._comment
@@ -0,0 +1,29 @@
+[[!comment format=mdwn
+ username="https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574"
+ nickname="Mica Semrick"
+ subject="Now I'm getting..."
+ date="2013-12-27T08:01:44Z"
+ content="""
+~~~
+$ git-annex info
+repository mode: indirect
+trusted repositories: fatal: Not a git repository: '/home/micas/Music/.git'
+fatal: Not a git repository: '/home/micas/Music/.git'
+0
+semitrusted repositories: 3
+	00000000-0000-0000-0000-000000000001 -- web
+ 	85f8a5ea-6278-11e2-9978-ebb59e8f37a2 -- here (Music annex backup)
+ 	9aff38f2-6447-11e2-8c89-ef50e6c0ea6c -- backupone (Music annex backupone)
+untrusted repositories: 0
+transfers in progress: none
+available local disk space: 174.28 gigabytes (+1 megabyte reserved)
+local annex keys: 5348
+local annex size: 25.62 gigabytes
+annexed files in working tree: 5374
+size of annexed files in working tree: 25.68 gigabytes
+bloom filter size: 16 mebibytes (1.1% full)
+backend usage: 
+	SHA256: 10692
+	SHA256E: 30
+~~~
+"""]]
diff --git a/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories.mdwn b/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories.mdwn
new file mode 100644
index 000000000..898d4870a
--- /dev/null
+++ b/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories.mdwn
@@ -0,0 +1 @@
+In my documents folder I have some Mercurial and Git repositories. Are there any side effects if I track the whole directory with git annex?