aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-tree.c
Commit message (Collapse)AuthorAge
* merge-tree: remove unnecessary call of git_extract_argv0_pathJohannes Sixt2010-01-22
| | | | | | | | This call should have been removed when the utility was made a builtin by 907a7cb. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* make "git merge-tree" a built-inLinus Torvalds2010-01-21
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>