diff options
author | Elijah Newren <newren@gmail.com> | 2011-08-12 09:20:27 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-15 01:19:40 +0400 |
commit | 35a74abff32c32c455a74974130ad2af7d81dfd9 (patch) | |
tree | 2e48ff97b04f0170aaf6a08240fff9628b39ef60 /http-walker.c | |
parent | 3e333a6146ce6565de357e48e439bb94c622d3fe (diff) |
merge-recursive: Avoid unnecessary file rewrites
Often times, a potential conflict at a path is resolved by merge-recursive
by using the content that was already present at that location. In such
cases, we do not want to overwrite the content that is already present, as
that could trigger unnecessary recompilations. One of the patches earlier
in this series ("merge-recursive: When we detect we can skip an update,
actually skip it") fixed the cases that involved content merges, but there
were a few other cases as well.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-walker.c')
0 files changed, 0 insertions, 0 deletions