From f935390e10e166276ff82e4c2711b23ca0499392 Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Thu, 28 Nov 2013 07:25:31 +0000 Subject: [PATCH] git rm doesn't work, we better have to reset. No git commit is necessary, then. --- doc/tips/recover_data_from_lost+found.mdwn | 4 ++-- 1 file 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 48ef2a1d73..506ffec394 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