merge 2006 builtin/am.c opts.merge = 1; merge 2043 builtin/am.c opts.merge = 1; merge 33 builtin/checkout.c int merge; merge 261 builtin/checkout.c if (opts->merge && opts->patch_mode) merge 264 builtin/checkout.c if (opts->force && opts->merge) merge 329 builtin/checkout.c if (opts->merge) merge 342 builtin/checkout.c } else if (opts->merge) { merge 368 builtin/checkout.c else if (opts->merge) merge 418 builtin/checkout.c opts.merge = 1; merge 502 builtin/checkout.c topts.merge = 1; merge 503 builtin/checkout.c topts.gently = opts->merge && old->commit; merge 528 builtin/checkout.c if (!opts->merge) merge 1084 builtin/checkout.c if (opts->force && opts->merge) merge 1148 builtin/checkout.c OPT_BOOL('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")), merge 1176 builtin/checkout.c opts.merge = 1; /* implied */ merge 1254 builtin/checkout.c if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge) merge 709 builtin/clone.c opts.merge = 1; merge 297 builtin/commit.c opts.merge = 1; merge 176 builtin/fetch.c refspec.src = branch->merge[i]->src; merge 608 builtin/merge.c opts.merge = 1; merge 943 builtin/merge.c if (!branch->merge[i]->dst) merge 945 builtin/merge.c branch->merge[i]->src, branch->remote_name); merge 946 builtin/merge.c args[i] = branch->merge[i]->dst; merge 1004 builtin/notes.c result = merge(argc, argv, prefix); merge 64 builtin/push.c if (branch->merge_nr == 1 && branch->merge[0]->src) { merge 67 builtin/push.c ref, branch->merge[0]->src); merge 131 builtin/push.c const char *short_upstream = branch->merge[0]->src; merge 171 builtin/push.c if (!branch->merge_nr || !branch->merge || !branch->remote_name) merge 190 builtin/push.c if (strcmp(branch->refname, branch->merge[0]->src)) merge 194 builtin/push.c strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src); merge 116 builtin/read-tree.c OPT_SET_INT('m', NULL, &opts.merge, merge 156 builtin/read-tree.c if (1 < opts.merge + opts.reset + prefix_set) merge 168 builtin/read-tree.c if (opts.reset || opts.merge || opts.prefix) { merge 169 builtin/read-tree.c if (read_cache_unmerged() && (opts.prefix || opts.merge)) merge 171 builtin/read-tree.c stage = opts.merge = 1; merge 191 builtin/read-tree.c if ((opts.update || opts.index_only) && !opts.merge) merge 196 builtin/read-tree.c if (opts.merge && !opts.index_only) merge 199 builtin/read-tree.c if (opts.merge) { merge 247 builtin/remote.c struct string_list merge; merge 296 builtin/remote.c char *merge; merge 297 builtin/remote.c merge = xstrndup(value, space - value); merge 298 builtin/remote.c string_list_append(&info->merge, merge); merge 302 builtin/remote.c string_list_append(&info->merge, xstrdup(value)); merge 947 builtin/remote.c if (!branch_info->merge.nr || !branch_info->remote_name || merge 965 builtin/remote.c struct string_list *merge = &branch_info->merge; merge 969 builtin/remote.c if (branch_info->rebase && branch_info->merge.nr > 1) { merge 977 builtin/remote.c printf_ln(_("rebases onto remote %s"), merge->items[0].string); merge 980 builtin/remote.c printf_ln(_(" merges with remote %s"), merge->items[0].string); merge 983 builtin/remote.c printf_ln(_("merges with remote %s"), merge->items[0].string); merge 986 builtin/remote.c for (i = 1; i < merge->nr; i++) merge 988 builtin/remote.c merge->items[i].string); merge 54 builtin/reset.c opts.merge = 1; merge 479 diff-lib.c opts.merge = 1; merge 222 merge-recursive.c struct tree *merge) merge 233 merge-recursive.c opts.merge = 1; merge 242 merge-recursive.c init_tree_desc_from_tree(t+2, merge); merge 823 merge-recursive.c merge:1; merge 896 merge-recursive.c result.merge = 0; merge 910 merge-recursive.c result.merge = 1; merge 921 merge-recursive.c result.merge = 1; merge 1805 merge-recursive.c struct tree *merge, merge 1812 merge-recursive.c merge = shift_tree_object(head, merge, o->subtree_shift); merge 1816 merge-recursive.c if (sha_eq(common->object.sha1, merge->object.sha1)) { merge 1822 merge-recursive.c code = git_merge_trees(o->call_depth, common, head, merge); merge 1828 merge-recursive.c sha1_to_hex(merge->object.sha1)); merge 1839 merge-recursive.c get_files_dirs(o, merge); merge 1843 merge-recursive.c re_head = get_renames(o, head, common, head, merge, entries); merge 1844 merge-recursive.c re_merge = get_renames(o, merge, common, head, merge, entries); merge 1995 merge-recursive.c const unsigned char *merge, merge 2003 merge-recursive.c struct commit *next_commit = get_ref(merge, o->branch2); merge 42 merge-recursive.h struct tree *merge, merge 52 merge-recursive.h const unsigned char *merge, merge 77 merge.c opts.merge = 1; merge 1653 remote.c if (ret->merge) merge 1666 remote.c ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge)); merge 1668 remote.c ret->merge[i] = xcalloc(1, sizeof(**ret->merge)); merge 1669 remote.c ret->merge[i]->src = xstrdup(ret->merge_name[i]); merge 1670 remote.c if (!remote_find_tracking(remote, ret->merge[i]) || merge 1675 remote.c ret->merge[i]->dst = ref; merge 1677 remote.c ret->merge[i]->dst = xstrdup(ret->merge_name[i]); merge 1696 remote.c return branch && !!branch->merge; merge 1705 remote.c return refname_match(branch->merge[i]->src, refname); merge 1725 remote.c if (!branch->merge || !branch->merge[0]) { merge 1739 remote.c if (!branch->merge[0]->dst) merge 1742 remote.c branch->merge[0]->src); merge 1744 remote.c return branch->merge[0]->dst; merge 209 remote.h struct refspec **merge; merge 544 rerere.c if (!merge(name, path)) { merge 588 unpack-trees.c src[i + o->merge] = o->df_conflict_entry; merge 593 unpack-trees.c if (!o->merge) merge 601 unpack-trees.c src[i + o->merge] = create_ce_entry(info, names + i, stage); merge 604 unpack-trees.c if (o->merge) { merge 608 unpack-trees.c struct cache_entry *ce = src[i + o->merge]; merge 753 unpack-trees.c if (o->merge) { merge 793 unpack-trees.c if (o->merge && src[0]) { merge 1094 unpack-trees.c if (o->merge) { merge 1503 unpack-trees.c struct cache_entry *merge = dup_entry(ce); merge 1519 unpack-trees.c merge->ce_flags |= CE_NEW_SKIP_WORKTREE; merge 1521 unpack-trees.c if (verify_absent(merge, merge 1523 unpack-trees.c free(merge); merge 1526 unpack-trees.c invalidate_ce_path(merge, o); merge 1535 unpack-trees.c if (same(old, merge)) { merge 1536 unpack-trees.c copy_cache_entry(merge, old); merge 1540 unpack-trees.c free(merge); merge 1555 unpack-trees.c do_add_entry(o, merge, update, CE_STAGEMASK); merge 36 unpack-trees.h merge, merge 50 xdiff/xmerge.c static int xdl_append_merge(xdmerge_t **merge, int mode, merge 55 xdiff/xmerge.c xdmerge_t *m = *merge; merge 74 xdiff/xmerge.c if (*merge) merge 75 xdiff/xmerge.c (*merge)->next = m; merge 76 xdiff/xmerge.c *merge = m;