diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:35:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:36:05 -0700 |
| commit | 34f5130af84f7a37fba327d5a5be4f4427dc6886 (patch) | |
| tree | 1f8836fe7fb70566e31b3f4f5d1475fabd95981b /t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side | |
| parent | Merge branch 'nd/i18n-index-pack' (diff) | |
| parent | reduce_heads(): reimplement on top of remove_redundant() (diff) | |
| download | tgif-34f5130af84f7a37fba327d5a5be4f4427dc6886.tar.xz | |
Merge branch 'jc/merge-bases'
Optimise the "merge-base" computation a bit, and also update its
users that do not need the full merge-base information to call a
cheaper subset.
* jc/merge-bases:
reduce_heads(): reimplement on top of remove_redundant()
merge-base: "--is-ancestor A B"
get_merge_bases_many(): walk from many tips in parallel
in_merge_bases(): use paint_down_to_common()
merge_bases_many(): split out the logic to paint history
in_merge_bases(): omit unnecessary redundant common ancestor reduction
http-push: use in_merge_bases() for fast-forward check
receive-pack: use in_merge_bases() for fast-forward check
in_merge_bases(): support only one "other" commit
Diffstat (limited to 't/t4013/diff.diff-tree_--pretty_--patch-with-stat_side')
0 files changed, 0 insertions, 0 deletions