summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-22 02:25:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-22 04:06:58 (GMT)
commit907a7cb51c6c44d25f4c734a46d5174363190a84 (patch)
tree437762890f02ae63b73763aa666117b6882ee068 /builtin.h
parenta5031214c4fe5f5d3fcf649d10769744cbc66fed (diff)
downloadgit-907a7cb51c6c44d25f4c734a46d5174363190a84.zip
git-907a7cb51c6c44d25f4c734a46d5174363190a84.tar.gz
git-907a7cb51c6c44d25f4c734a46d5174363190a84.tar.bz2
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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index c3f83c0..0936ad2 100644
--- a/builtin.h
+++ b/builtin.h
@@ -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);