diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-10-26 15:53:49 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-29 07:08:30 (GMT) |
| commit | db699a8a1f2c8063620efae41e66786c11a31d8f (patch) | |
| tree | 354121c11f07e75d89757593f2d9aae1909056bf /merge-recursive.h | |
| parent | 2cfceefaca16d64baecf0ba9bcd4e05229d9c31b (diff) | |
| download | git-db699a8a1f2c8063620efae41e66786c11a31d8f.zip git-db699a8a1f2c8063620efae41e66786c11a31d8f.tar.gz git-db699a8a1f2c8063620efae41e66786c11a31d8f.tar.bz2 | |
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.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index 58f3435..9e090a3 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 |