diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-07 00:50:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-07 00:50:33 -0800 |
| commit | b539c5e8fbd36e38eb8f589e11aa5b136ddce753 (patch) | |
| tree | d9e5e8dca5c27f1d311046a558f346c64a7bb343 /git-merge-recursive.py | |
| parent | 3bd348aeea24709cd9be4b9d741f79b6014cd7e3 (diff) | |
| download | git-b539c5e8fbd36e38eb8f589e11aa5b136ddce753.tar.gz | |
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>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions