projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 985cb9c) | patch
merge-recursive: Make use of provided bases
authorFredrik Kuivinen <freku045@student.liu.se>
Thu, 2 Feb 2006 11:43:20 +0000 (12:43 +0100)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Feb 2006 20:30:51 +0000 (12:30 -0800)
commit008bb6ea695e14740bfd14bec805cde6219b336e
tree8f3f765a55cd88bf7cd34158daca1e67220690aetree | snapshot
parent985cb9cc5851ae2f65acf74a8db5077b69cc2a9bcommit | diff
merge-recursive: Make use of provided bases

This makes some cases faster as we don't have to build the commit graph.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py diff | blob | history
The core git plumbing