diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-06 00:07:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-06 00:07:58 -0800 |
| commit | be61db922a230ae2638c27c071ee4b8c98f01f72 (patch) | |
| tree | bbd042215a652422d50ca6425226af5dc2fa4cc1 /convert-objects.c | |
| parent | Documentaiton (read-tree): update description of 3-way (diff) | |
| download | tgif-be61db922a230ae2638c27c071ee4b8c98f01f72.tar.xz | |
git-merge-one-file: resurrect leading path creation.
Since we do not use git-update-index followed by
git-checkout-index -u to create the half-merged file on
conflicting case anymore, we need to make sure the leading
directories are created here.
Maybe a better solution would be to allow update-index to add to
higher stage, and checkout-index to extract from such, but that
is a change slightly bigger than I would like to have so close
to 1.0, so this should do for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'convert-objects.c')
0 files changed, 0 insertions, 0 deletions