| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Wed, 10 Sep 2008 20:10:32 +0000 (22:10 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Sep 2008 23:11:00 +0000 (16:11 -0700) | ||
| commit | 6bb6b0341af26739ba305b20c62a433f15029049 | |
| tree | cd737ea324f4e54574a69631889232a42f85f650 | tree | snapshot |
| parent | ee20a129de6f332da092e93feb2dd5f8330f9bc0 | commit | diff |
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>
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>
| builtin-commit.c | diff | blob | history |