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

2 files changed, 19 insertions, 0 deletions

diff --git a/doc/forum/avoid_rehashing_when_converting_existing_backups_into_new_remotes/comment_4_e6bb8a33608908d02eeb921d039f22b9._comment b/doc/forum/avoid_rehashing_when_converting_existing_backups_into_new_remotes/comment_4_e6bb8a33608908d02eeb921d039f22b9._comment
new file mode 100644
index 000000000..8560857a7
--- /dev/null
+++ b/doc/forum/avoid_rehashing_when_converting_existing_backups_into_new_remotes/comment_4_e6bb8a33608908d02eeb921d039f22b9._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 4"
+ date="2015-12-23T12:46:36Z"
+ content="""
+> This is unlikely to waste enough time to make it worthwhile to develop a hack that only hashes once.
+
+In my super-heavy use case, the second hashing of the files is *dwarfed* by the 45 minute wait for git to update .git/index, so I would agree with this.
+"""]]
diff --git a/doc/tips/centralized_git_repository_tutorial/on_your_own_server/comment_1_2e128976d517eaa4cbb92f036abe22ea._comment b/doc/tips/centralized_git_repository_tutorial/on_your_own_server/comment_1_2e128976d517eaa4cbb92f036abe22ea._comment
new file mode 100644
index 000000000..075341b31
--- /dev/null
+++ b/doc/tips/centralized_git_repository_tutorial/on_your_own_server/comment_1_2e128976d517eaa4cbb92f036abe22ea._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="mark@6b90344cdab3158eacb94a3944460d138afc9bef"
+ nickname="mark"
+ subject="Centralized server with separate remote"
+ date="2015-12-23T17:59:48Z"
+ content="""
+If I have git in a centralized server setup (local computer) and want the annexed files to be stored on S3, say, then do I have to have git and git-annex running on S3?
+
+Thanks! Mark
+"""]]