Added a comment
This commit is contained in:
parent
68ba0f8ab8
commit
7871699567
1 changed files with 10 additions and 0 deletions
|
@ -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.
|
||||
"""]]
|
Loading…
Reference in a new issue