unpack-trees: rename "gently" flag to "quiet"

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 0e6037b2968f326ca2781fa141d74683e52c983c..22fb6c0cae89a78ef2353f33591de65c721a0120 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -700,7 +700,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
                topts.initial_checkout = is_cache_unborn();
                topts.update = 1;
                topts.merge = 1;
-               topts.gently = opts->merge && old_branch_info->commit;
+               topts.quiet = opts->merge && old_branch_info->commit;
                topts.verbose_update = opts->show_progress;
                topts.fn = twoway_merge;
                if (opts->overwrite_ignore) {