diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-07-09 18:20:14 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-07-09 18:20:14 +0000 |
| commit | e3018d270d62a8f6c383be6acdafb56393e7063a (patch) | |
| tree | 9204c72ac53073e15fa5588f5e3d9bd1a15e5c90 | |
| parent | cb26130b552fc279a80fbe0952d96574f2c261bb (diff) | |
Added a comment
| -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. +"""]] |