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

This commit is contained in:
Joey Hess 2014-09-11 14:06:26 -04:00
commit 843396ea2f
2 changed files with 24 additions and 0 deletions

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.132"
subject="comment 1"
date="2014-09-11T17:45:31Z"
content="""
Unfortunately, the old version of git-annex you have been using is exactly the wrong version, so you ran into this horrible bug, which is fixed in newer versions.
<http://git-annex.branchable.com/bugs/bad_merge_commit_deleting_all_files/>
That page has details, including instructions on how to recover your data.
I hope that you were not using that old version because it's included in some distribution somewhere still?
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.132"
subject="comment 1"
date="2014-09-11T17:55:28Z"
content="""
~/.ssh/git-annex-shell is a wrapper script that gets installed when you use the standalone build. You can delete it and your problem will be fixed.
It would probably be good if the standalone build came with an uninstallation script.
"""]]