summaryrefslogtreecommitdiff
path: root/builtin-merge-tree.c
Commit message (Expand)AuthorAgeFilesLines
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-358/+0
* merge-tree: remove unnecessary call of git_extract_argv0_pathJohannes Sixt2010-01-221-2/+0
* make "git merge-tree" a built-inLinus Torvalds2010-01-211-0/+360