summaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 12:18:17 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 12:18:17 -0700
commit6683463ed6b2da9eed309c305806f9393d1ae728 (patch)
tree6d296ca7b9d8916797835771722b0c46085a6ea4 /git-pull-script
parent15000d78996db926d18dd68e6f5f5770de09cad3 (diff)
Do a very simple "merge-base" that finds the most recent common
parent of two commits. The question of "best" commit can probably be tweaked almost arbitrarily. In particular, trying to take things like how big the tree differences are into account migt be a good idea. This one is just very simple.
Diffstat (limited to 'git-pull-script')
0 files changed, 0 insertions, 0 deletions