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

3 files changed, 28 insertions, 0 deletions

diff --git a/doc/bugs/detox___34__destroys__34___annex/comment_2_94831c9199e07c2eaef42b404277637b._comment b/doc/bugs/detox___34__destroys__34___annex/comment_2_94831c9199e07c2eaef42b404277637b._comment
new file mode 100644
index 000000000..f4f432bcd
--- /dev/null
+++ b/doc/bugs/detox___34__destroys__34___annex/comment_2_94831c9199e07c2eaef42b404277637b._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="atrent"
+ subject="comment 2"
+ date="2015-11-16T07:50:29Z"
+ content="""
+I know it's not a git-annex bug, I'm not blaming, just noting that there may be chances of random renaming... As you say it's more of a detox bug (also rdfind messes hidden dirs). Thanks for pinpointing to \"recover data...\", it's the \"script\" I was searching for.
+"""]]
diff --git a/doc/special_remotes/comment_28_c7ab32e1e63fc114b3b2f56bab62eafa._comment b/doc/special_remotes/comment_28_c7ab32e1e63fc114b3b2f56bab62eafa._comment
new file mode 100644
index 000000000..fea43697e
--- /dev/null
+++ b/doc/special_remotes/comment_28_c7ab32e1e63fc114b3b2f56bab62eafa._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="craig@6ddb6e2c94325e18a0d631a06e63fdc111ab1f12"
+ nickname="craig"
+ subject="Thanks"
+ date="2015-11-16T05:34:35Z"
+ content="""
+Sorry, didn't post a follow up, but git annex enableremote did exactly what I expected.  Thanks.
+"""]]
diff --git a/doc/tips/recover_data_from_lost+found/comment_3_02cb9efd54d8447d0bd11e5981e7dca7._comment b/doc/tips/recover_data_from_lost+found/comment_3_02cb9efd54d8447d0bd11e5981e7dca7._comment
new file mode 100644
index 000000000..7121f380c
--- /dev/null
+++ b/doc/tips/recover_data_from_lost+found/comment_3_02cb9efd54d8447d0bd11e5981e7dca7._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="atrent"
+ subject="comment 3"
+ date="2015-11-16T09:06:34Z"
+ content="""
+This procedure is also very useful when you accidentally rename files in the object dir.
+
+Such a case occurred to me when I 'detoxed' a git-annex: detox renames files and it substitutes \"--\" with \"-\", thus destroying my annex.
+
+I find git-annex very elegant in this situation: rather than trying to rename back the files (objects) you just re-add them (since content is still there unmodified) recreating the symlink targets!
+
+Kudos!
+"""]]