strategy           57 builtin/merge.c static struct strategy **use_strategies;
strategy           71 builtin/merge.c static struct strategy all_strategy[] = {
strategy          104 builtin/merge.c static struct strategy *get_strategy(const char *name)
strategy          107 builtin/merge.c 	struct strategy *ret;
strategy          151 builtin/merge.c 	ret = xcalloc(1, sizeof(struct strategy));
strategy          157 builtin/merge.c static void append_strategy(struct strategy *s)
strategy          635 builtin/merge.c static int try_merge_strategy(const char *strategy, struct commit_list *common,
strategy          648 builtin/merge.c 	if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
strategy          661 builtin/merge.c 		if (!strcmp(strategy, "subtree"))
strategy          687 builtin/merge.c 		return try_merge_command(strategy, xopts_nr, xopts,
strategy          711 builtin/merge.c static void split_merge_strategies(const char *string, struct strategy **list,
strategy          739 builtin/merge.c 	struct strategy *list = NULL;
strategy          742 builtin/notes.c 					 enum notes_merge_strategy *strategy)
strategy          748 builtin/notes.c 	if (parse_notes_merge_strategy(value, strategy))
strategy          762 builtin/notes.c 	const char *strategy = NULL;
strategy          767 builtin/notes.c 		OPT_STRING('s', "strategy", &strategy, N_("strategy"),
strategy          784 builtin/notes.c 	if (strategy || do_commit + do_abort == 0)
strategy          814 builtin/notes.c 	if (strategy) {
strategy          815 builtin/notes.c 		if (parse_notes_merge_strategy(strategy, &o.strategy)) {
strategy          816 builtin/notes.c 			error("Unknown -s/--strategy: %s", strategy);
strategy          829 builtin/notes.c 		if (git_config_get_notes_strategy(merge_key.buf, &o.strategy))
strategy          830 builtin/notes.c 			git_config_get_notes_strategy("notes.mergeStrategy", &o.strategy);
strategy           89 builtin/revert.c 		OPT_STRING(0, "strategy", &opts->strategy, N_("strategy"), N_("merge strategy")),
strategy          149 builtin/revert.c 				"--strategy", opts->strategy ? 1 : 0,
strategy         1679 cache.h        int try_merge_command(const char *strategy, size_t xopts_nr,
strategy           18 merge.c        int try_merge_command(const char *strategy, size_t xopts_nr,
strategy           26 merge.c        	argv_array_pushf(&args, "merge-%s", strategy);
strategy          436 notes-merge.c  	switch (o->strategy) {
strategy          469 notes-merge.c  	die("Unknown strategy (%i).", o->strategy);
strategy           18 notes-merge.h  	enum notes_merge_strategy strategy;
strategy          570 sequencer.c    	if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REPLAY_REVERT) {
strategy          582 sequencer.c    		res = try_merge_command(opts->strategy, opts->xopts_nr, opts->xopts,
strategy          784 sequencer.c    		git_config_string(&opts->strategy, key, value);
strategy          951 sequencer.c    	if (opts->strategy)
strategy          952 sequencer.c    		git_config_set_in_file(opts_file, "options.strategy", opts->strategy);
strategy           43 sequencer.h    	const char *strategy;