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

3 files changed, 30 insertions, 1 deletions

diff --git a/doc/backends.mdwn b/doc/backends.mdwn
index 14b138468..710255dcf 100644
--- a/doc/backends.mdwn
+++ b/doc/backends.mdwn
@@ -15,7 +15,7 @@ can use different ones for different files.
 * `SHA512`, `SHA512E` -- Best SHA-2 hash, for the very paranoid.
 * `SHA384`, `SHA384E`, `SHA224`, `SHA224E` -- SHA-2 hashes for
   people who like unusual sizes.
-* `SHA3_512`, `SHA_512E`, `SHA3_384`, `SHA3_384E`, `SHA3_256`, `SHA3_256E`, `SHA3_224`, `SHA3_224E`
+* `SHA3_512`, `SHA3_512E`, `SHA3_384`, `SHA3_384E`, `SHA3_256`, `SHA3_256E`, `SHA3_224`, `SHA3_224E`
   -- SHA-3 hashes, for bleeding edge fun.
 * `SKEIN512`, `SKEIN512E`, `SKEIN256`, `SKEIN256E`
   -- [Skein hash](http://en.wikipedia.org/wiki/Skein_hash),
diff --git a/doc/bugs/allow_disk_space_quota_independent_of_free_disk_space.mdwn b/doc/bugs/allow_disk_space_quota_independent_of_free_disk_space.mdwn
new file mode 100644
index 000000000..b1602dc9c
--- /dev/null
+++ b/doc/bugs/allow_disk_space_quota_independent_of_free_disk_space.mdwn
@@ -0,0 +1,18 @@
+### Please describe the problem.
+Feature Request. Instead of (or perhaps in addition to) setting `annex.diskreserve`, I'd like to be able to tell git-annex "use up to 2TB of disk space".
+
+### What steps will reproduce the problem?
+
+
+### What version of git-annex are you using? On what operating system?
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_5_b5d7fcd0dd707cd2b62d8b9eb2cae3f0._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_5_b5d7fcd0dd707cd2b62d8b9eb2cae3f0._comment
new file mode 100644
index 000000000..bffe9debd
--- /dev/null
+++ b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_5_b5d7fcd0dd707cd2b62d8b9eb2cae3f0._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="edward"
+ subject="Same problem, git revert worked, sort of"
+ date="2015-08-13T11:18:42Z"
+ content="""
+I had a similar problem. I ran `git annex sync` twice, once on the laptop, then on the external drive, lots of git annex symlinks disappeared from the laptop, the symlinks are still present on external drive checkout directory, but git says they were deleted, when I run `git status` it lists them as untracked files. I followed the advice and ran `git log --stat` to find the commit that removed the files. The commit message is \"git-annex in big portable USB drive\". I'm pretty sure that this is a commit from `git annex sync`.
+
+Running `git revert` worked on the laptop, but it fails external drive, it says \"error: The following untracked working tree files would be overwritten by merge\" and starts listing the missing symlinks.
+
+Both annex checkouts are set to indirect mode. The laptop preferred content is manual, the external drive is backup. I've run the assistant in the past, but not recently. I'm running Debian git-annex 5.20150727-2. Let me know if you need any more information.
+"""]]