diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-10 11:20:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-10 14:45:20 -0800 |
| commit | 8b944b5678efcbbbedfd555e5eef1500dc6074d1 (patch) | |
| tree | cdc501b84f1ac9c04b68086c40f0efa44287bf7a /builtin-blame.c | |
| parent | f5184380f08c814535e7bda374e403596eef90a3 (diff) | |
| download | git-8b944b5678efcbbbedfd555e5eef1500dc6074d1.tar.gz | |
merge-recursive: do not use on-file index when not needed.
This revamps the merge-recursive implementation following the
outline in:
Message-ID: <7v8xgileza.fsf@assigned-by-dhcp.cox.net>
There is no need to write out the index until the very end just
once from merge-recursive. Also there is no need to write out
the resulting tree object for the simple case of merging with a
single merge base.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-blame.c')
0 files changed, 0 insertions, 0 deletions