summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-10-26 22:53:49 +0700
committerJeff King <peff@peff.net>2012-10-29 03:08:30 -0400
commitdb699a8a1f2c8063620efae41e66786c11a31d8f (patch)
tree354121c11f07e75d89757593f2d9aae1909056bf /merge-recursive.h
parent2cfceefaca16d64baecf0ba9bcd4e05229d9c31b (diff)
downloadgit-db699a8a1f2c8063620efae41e66786c11a31d8f.tar.gz
Move try_merge_command and checkout_fast_forward to libgit.a
These functions are called in sequencer.c, which is part of libgit.a. This makes libgit.a potentially require builtin/merge.c for external git commands. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'merge-recursive.h')
-rw-r--r--merge-recursive.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index 58f3435e9e..9e090a3470 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -59,9 +59,4 @@ struct tree *write_tree_from_memory(struct merge_options *o);
int parse_merge_opt(struct merge_options *out, const char *s);
-/* builtin/merge.c */
-int try_merge_command(const char *strategy, size_t xopts_nr,
- const char **xopts, struct commit_list *common,
- const char *head_arg, struct commit_list *remotes);
-
#endif