summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar TroisSinges <TroisSinges@web>2013-11-28 07:25:31 +0000
committerGravatar admin <admin@branchable.com>2013-11-28 07:25:31 +0000
commit40651a8a84faa98ffad366d197294d8d32f8901a (patch)
treecf37cdb0cf778159d55149da87a9a0fec83d7b65
parent7eb3685340256bd1b1e9f88dbd379a71f5ff4ca3 (diff)
git rm doesn't work, we better have to reset. No git commit is necessary, then.
-rw-r--r--doc/tips/recover_data_from_lost+found.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tips/recover_data_from_lost+found.mdwn b/doc/tips/recover_data_from_lost+found.mdwn
index 48ef2a1d7..506ffec39 100644
--- a/doc/tips/recover_data_from_lost+found.mdwn
+++ b/doc/tips/recover_data_from_lost+found.mdwn
@@ -8,8 +8,8 @@ First, check out the git repository again. Then, in the new checkout:
$ sudo chown you:you recovered-content
$ chmod -R u+w recovered-content
$ git annex add recovered-content
- $ git rm recovered-content
- $ git commit -m "recovered some content"
+ $ git reset HEAD recovered-content
+ $ rm -rf recovered-content
$ git annex fsck
The way that works is that when git-annex adds the same content that was in