diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8 <daniele@web> | 2014-07-18 00:38:29 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-07-18 00:38:29 +0000 |
| commit | 96098f878224669923a1d9b9c8e7852980e5747a (patch) | |
| tree | 99729a0c823d4504caa41f5cd616739aa94f3d02 /doc | |
| parent | 8261d4def153c043c00f8c0ec65abfe44f60f513 (diff) | |
minor fix
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/git_annex_still_deleting_content_when_merging.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn index de5ef2181..2aa73fa7a 100644 --- a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn +++ b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn @@ -28,7 +28,7 @@ Looking at 'git log --stat' in *B*: shared.skg | 1 - 1 file changed, 1 deletion(-) -When things go well, it only does 1 deletion and 1 insertion (a change is apparently deleting and rewriting the file, maybe because it's a binary (encrypted) file?). The third most recent deletion is probably the one that shouldn't happen. +A change is apparently deleting and rewriting the whole file (maybe that's normal because it's a binary (encrypted) file?). The third most recent deletion is probably the one that shouldn't happen. Reverting "d9eb9e94a39" will only recover a placeholder, not really the original file. I can get the content back by going through *git annex unused* with *git log -S'key'*, then going to indirect mode, and then using *addunused*. |