diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-03-10 17:11:42 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-03-10 17:11:42 +0000 |
| commit | 2071699bbf09f2dbb7ab6ca9d711f22cc8c71c12 (patch) | |
| tree | 0b68676237f9d408cddc5075e701ce0fd5649ab7 /doc | |
| parent | 0a6588cc540de4a268a5be9103eb6e4d8a8c0330 (diff) | |
Added a comment
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment new file mode 100644 index 000000000..277a72b63 --- /dev/null +++ b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="108.236.230.124" + subject="comment 2" + date="2014-03-10T17:11:41Z" + content=""" +Your laptop is in indirect mode, so we know that the only way files can be deleted by a merge is if a commit was made to git that deletes the files. + +My conclusion is that some repository, perhaps the usb drive, made a commit that deleted those files. You should be able to find this commit with `git log --stat`, and can just `git revert` it if you want to. + +So far, I don't see evidence of a bug. For all I know, you actually did delete the files on the usb drive, and that change got committed.. +"""]] |