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

3 files changed, 44 insertions, 0 deletions

diff --git a/doc/bugs/webapp_missing_in_20150522_release.mdwn b/doc/bugs/webapp_missing_in_20150522_release.mdwn
new file mode 100644
index 000000000..4c96ed6da
--- /dev/null
+++ b/doc/bugs/webapp_missing_in_20150522_release.mdwn
@@ -0,0 +1,34 @@
+### Please describe the problem.
+
+Using the prebuilt linux tarball, version 20150522 fails to start the webapp.
+
+Doing it manually from the console, just gives me the help text. 
+
+Trying out an older version shows me the webapp option below "watch" in the help, but this is missing in 20150522 version.
+
+git-annex version gives me:
+
+    git-annex version: 5.20150522-gb199d65
+    build flags: Assistant Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA
+    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E MD5E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 MD5 WORM URL
+    remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+
+### What steps will reproduce the problem?
+
+Use 20150522 version of git annex
+
+### What version of git-annex are you using? On what operating system?
+
+linux tarball, version 20150522
+
+Arch linux
+
+### 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/direct_mode/comment_17_e7c066fba8e28c61e8517c7a18a02457._comment b/doc/direct_mode/comment_17_e7c066fba8e28c61e8517c7a18a02457._comment
new file mode 100644
index 000000000..6847c5f9e
--- /dev/null
+++ b/doc/direct_mode/comment_17_e7c066fba8e28c61e8517c7a18a02457._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="mitzip"
+ subject="--depth undo option"
+ date="2015-05-27T02:54:17Z"
+ content="""
+Well I just spent 4 hours building a OSX GUI around git annex undo --depth and it responds with \"git-annex: unrecognized option '--depth'\"... lol Please tell me that option exists somewhere other than the documentation... lol
+"""]]
diff --git a/doc/forum/undo_--depth_option_missing.mdwn b/doc/forum/undo_--depth_option_missing.mdwn
new file mode 100644
index 000000000..cc50e383d
--- /dev/null
+++ b/doc/forum/undo_--depth_option_missing.mdwn
@@ -0,0 +1,3 @@
+Well I just spent 4 hours building a OSX GUI around git annex undo --depth and it responds with "git-annex: unrecognized option '--depth'"... lol Please tell me that option exists somewhere other than the documentation... lol
+
+Should I abandon my efforts or does it really exist (I couldn't find it in the source)?