diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-22 05:25:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 07:06:58 +0300 |
| commit | 907a7cb51c6c44d25f4c734a46d5174363190a84 (patch) | |
| tree | 437762890f02ae63b73763aa666117b6882ee068 /builtin.h | |
| parent | a5031214c4fe5f5d3fcf649d10769744cbc66fed (diff) | |
make "git merge-tree" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
| -rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -70,6 +70,7 @@ extern int cmd_merge_base(int argc, const char **argv, const char *prefix); extern int cmd_merge_ours(int argc, const char **argv, const char *prefix); extern int cmd_merge_file(int argc, const char **argv, const char *prefix); extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix); +extern int cmd_merge_tree(int argc, const char **argv, const char *prefix); extern int cmd_mktree(int argc, const char **argv, const char *prefix); extern int cmd_mv(int argc, const char **argv, const char *prefix); extern int cmd_name_rev(int argc, const char **argv, const char *prefix); |