diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-05 15:06:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-05 15:06:26 -0800 |
| commit | 6376463c37e0371a411013b90b2e8fc0f7d27dfa (patch) | |
| tree | d2f08dd76391e6afad72a825bbd072ef53683281 /git-merge-octopus.sh | |
| parent | Merge branch 'nd/http-fetch-shallow-fix' (diff) | |
| parent | tests: add checking that combine-diff emits only correct paths (diff) | |
| download | tgif-6376463c37e0371a411013b90b2e8fc0f7d27dfa.tar.xz | |
Merge branch 'ks/combine-diff'
Teach combine-diff to honour the path-output-order imposed by
diffcore-order, and optimize how matching paths are found in
the N-way diffs made with parents.
* ks/combine-diff:
tests: add checking that combine-diff emits only correct paths
combine-diff: simplify intersect_paths() further
combine-diff: combine_diff_path.len is not needed anymore
combine-diff: optimize combine_diff_path sets intersection
diff test: add tests for combine-diff with orderfile
diffcore-order: export generic ordering interface
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions