Junio C Hamano <gitster@xxxxxxxxx> writes: > Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > ... >> Sounds sane to me. > > Ok, then. > > Unfortunately it will be short-lived on 'master' as I have been > planning to merge Daniel's rewrite soon ;-) So here it is ;-) Thanks to the unpack_trees_options.gently flag, this does not have to say "Falling back to..." because the first "attempt to switch normally" would silently fail. --- builtin-checkout.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/builtin-checkout.c b/builtin-checkout.c index 5f176c6..283831e 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -232,6 +232,7 @@ static int merge_working_tree(struct checkout_opts *opts, topts.update = 1; topts.merge = 1; topts.gently = opts->merge; + topts.verbose_update = !opts->quiet; topts.fn = twoway_merge; topts.dir = xcalloc(1, sizeof(*topts.dir)); topts.dir->show_ignored = 1; - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
