1
0
mirror of https://github.com/git/git.git synced 2025-03-29 12:53:54 +00:00
Junio C Hamano 34f5130af8 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
2012-09-11 11:36:05 -07:00
..
2008-02-27 12:53:26 -08:00
2007-11-18 19:11:42 -08:00
2008-05-25 13:41:37 -07:00
2007-11-05 12:25:42 -08:00
2007-11-28 17:06:57 -08:00
2010-02-13 19:36:13 -08:00
2007-09-23 17:13:55 -07:00

These are original scripted implementations, kept primarily for their
reference value to any aspiring plumbing users who want to learn how
pieces can be fit together.