diff options
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/checkout.c | 1 | ||||
-rw-r--r-- | builtin/merge.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index f6caac104..f3dfb7b80 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -392,7 +392,6 @@ static int merge_working_tree(struct checkout_opts *opts, topts.dir = xcalloc(1, sizeof(*topts.dir)); topts.dir->flags |= DIR_SHOW_IGNORED; topts.dir->exclude_per_dir = ".gitignore"; - topts.show_all_errors = 1; tree = parse_tree_indirect(old->commit ? old->commit->object.sha1 : (unsigned char *)EMPTY_TREE_SHA1_BIN); diff --git a/builtin/merge.c b/builtin/merge.c index a25951475..32b4d9d02 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -704,7 +704,6 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote opts.verbose_update = 1; opts.merge = 1; opts.fn = twoway_merge; - opts.show_all_errors = 1; setup_unpack_trees_porcelain(&opts, "merge"); trees[nr_trees] = parse_tree_indirect(head); |