diff options
author | Joey Hess <joey@kitenet.net> | 2014-03-10 13:19:34 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-03-10 13:19:34 -0400 |
commit | 76f74d473c09827f96fd9e2333007f45b7cba924 (patch) | |
tree | ac16d7d50797f8b2c15336733e762b997d27148f /doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment | |
parent | 893bb509cdde7974fcc758dd6396ebc42230b698 (diff) | |
parent | 0c67e634be946e8c81b5e527a32b475369f003e9 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment')
-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.. +"""]] |