| commit | ab0974d626d7c7033938f83e9a1dbeb9b88b1f8e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Sep 2012 18:30:52 +0000 (7 11:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Sep 2012 18:30:53 +0000 (7 11:30 -0700) | ||
| tree | bb8f7ed55ffb48794e91865beccb54cb8a067798 | treesnapshot (tar.gz zip) |
| parent | bbcece1f8649c53018e30ceddaa7777aa8a61676 | commitdiff |
| parent | f37d3c755209234acfc2ca280027ebdab8e9ea8a | commitdiff |
Merge branch 'jc/merge-bases' into next
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
Conflicts:
builtin/merge-base.c
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
Conflicts:
builtin/merge-base.c