diff options
| author | Jeff King <peff@peff.net> | 2012-11-09 12:51:06 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-11-09 12:51:06 -0500 |
| commit | 19fb61369583410a4f79dbc065b4dc8125236c0b (patch) | |
| tree | 7f7498d204f8df97ddc0cd6726154a0ce5fa5bb7 /merge-recursive.h | |
| parent | 9d91c0e3d5d1bf9339a31ecbd5f6defdac8540d0 (diff) | |
| parent | 745f7a8cacae55df3e00507344d8db2a31eb57e8 (diff) | |
| download | git-19fb61369583410a4f79dbc065b4dc8125236c0b.tar.gz git-19fb61369583410a4f79dbc065b4dc8125236c0b.tar.xz | |
Merge branch 'nd/builtin-to-libgit'
Code cleanups so that libgit.a does not depend on anything in the
builtin/ directory.
* nd/builtin-to-libgit:
fetch-pack: move core code to libgit.a
fetch-pack: remove global (static) configuration variable "args"
send-pack: move core code to libgit.a
Move setup_diff_pager to libgit.a
Move print_commit_list to libgit.a
Move estimate_bisect_steps to libgit.a
Move try_merge_command and checkout_fast_forward to libgit.a
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 58f3435e9..9e090a347 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 |