diff options
Diffstat (limited to 'doc/bugs')
| -rw-r--r-- | doc/bugs/bad_merge_commit_deleting_all_files/comment_1_3503644244e39c65d531807769365f50._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files/comment_1_3503644244e39c65d531807769365f50._comment b/doc/bugs/bad_merge_commit_deleting_all_files/comment_1_3503644244e39c65d531807769365f50._comment new file mode 100644 index 000000000..6b24ea958 --- /dev/null +++ b/doc/bugs/bad_merge_commit_deleting_all_files/comment_1_3503644244e39c65d531807769365f50._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.55" + subject="comment 1" + date="2014-07-09T18:20:13Z" + content=""" +mergeDirect locks .git/index, so no other git command should use it while the merge is in progress. + +However, if the index file is deleted, and stageMerge runs, it stages deletion of all files. So that looks likely to be part of the story. +"""]] |