Andrew's git - gitweb.git/blob

   1#ifndef MERGE_RECURSIVE_H
   2#define MERGE_RECURSIVE_H
   3
   4#include "string-list.h"
   5
   6struct merge_options {
   7        const char *ancestor;
   8        const char *branch1;
   9        const char *branch2;
  10        enum {
  11                MERGE_RECURSIVE_NORMAL = 0,
  12                MERGE_RECURSIVE_OURS,
  13                MERGE_RECURSIVE_THEIRS
  14        } recursive_variant;
  15        const char *subtree_shift;
  16        unsigned buffer_output : 1;
  17        int verbosity;
  18        int diff_rename_limit;
  19        int merge_rename_limit;
  20        int call_depth;
  21        struct strbuf obuf;
  22        struct string_list current_file_set;
  23        struct string_list current_directory_set;
  24};
  25
  26/* merge_trees() but with recursive ancestor consolidation */
  27int merge_recursive(struct merge_options *o,
  28                    struct commit *h1,
  29                    struct commit *h2,
  30                    struct commit_list *ancestors,
  31                    struct commit **result);
  32
  33/* rename-detecting three-way merge, no recursion */
  34int merge_trees(struct merge_options *o,
  35                struct tree *head,
  36                struct tree *merge,
  37                struct tree *common,
  38                struct tree **result);
  39
  40/*
  41 * "git-merge-recursive" can be fed trees; wrap them into
  42 * virtual commits and call merge_recursive() proper.
  43 */
  44int merge_recursive_generic(struct merge_options *o,
  45                            const unsigned char *head,
  46                            const unsigned char *merge,
  47                            int num_ca,
  48                            const unsigned char **ca,
  49                            struct commit **result);
  50
  51void init_merge_options(struct merge_options *o);
  52struct tree *write_tree_from_memory(struct merge_options *o);
  53
  54/* builtin/merge.c */
  55int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
  56
  57#endif