Miklos Vajna 6bb6b0341a builtin-commit: use commit_tree() ...

First, it adds less code than removes, second this allows us to use
recuce_heads() for parents, so that the parents of a merge will be
always the same with or without a conflict.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2008-09-10 16:11:00 -07:00

28 KiB

Raw Blame History

View Raw