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

2 files changed, 21 insertions, 0 deletions

diff --git a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_1_984f75d8078f2809486f38ecb3b16be3._comment b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_1_984f75d8078f2809486f38ecb3b16be3._comment
new file mode 100644
index 000000000..3662fe04f
--- /dev/null
+++ b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_1_984f75d8078f2809486f38ecb3b16be3._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek"
+ nickname="Phil"
+ subject="comment 1"
+ date="2014-07-04T16:25:53Z"
+ content="""
+Looks like it might be related to msysGit:
+
+[bug on msysgit](http://osdir.com/ml/msysgit/2009-12/msg00007.html)
+"""]]
diff --git a/doc/forum/Comparison_with_other_big_files_solutions.mdwn b/doc/forum/Comparison_with_other_big_files_solutions.mdwn
new file mode 100644
index 000000000..cfbd12d29
--- /dev/null
+++ b/doc/forum/Comparison_with_other_big_files_solutions.mdwn
@@ -0,0 +1,11 @@
+# Comparison
+
+Based on my understanding of the http://git-annex.branchable.com/not/ page and of some research,
+I have made a draft of an [Online excel document][1] that compares different git file solutions.
+
+Feel free to edit the document and help the community to understand the different solutions out there.
+
+[1]: https://onedrive.live.com/redir?resid=C66C90783BD2C185!1200&authkey=!ACF-Ol_mG3DwQ2k&ithint=file%2c.xlsx
+
+Thank you very much,
+Alex