| commit | b539c5e8fbd36e38eb8f589e11aa5b136ddce753 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 7 Dec 2005 08:50:33 +0000 (7 00:50 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 7 Dec 2005 08:50:33 +0000 (7 00:50 -0800) | ||
| tree | d9e5e8dca5c27f1d311046a558f346c64a7bb343 | treesnapshot (tar.gz zip) |
| parent | 3bd348aeea24709cd9be4b9d741f79b6014cd7e3 | commitdiff |
git-merge-one: new merge world order.
This does two things:
- Use new --stage=2 option to create the working tree file with
leading paths and correct permission bits using
checkout-index, as before.
- Make sure we do not confuse "merge" program when the file
being merged has an unfortunate name, '-L'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This does two things:
- Use new --stage=2 option to create the working tree file with
leading paths and correct permission bits using
checkout-index, as before.
- Make sure we do not confuse "merge" program when the file
being merged has an unfortunate name, '-L'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-one-file.sh | diffblobblamehistory |