提交 52229a29 编写于 作者: J Junio C Hamano

checkout: show progress when checkout takes long time while switching branches

Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 1736855c
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册