checkout: show progress when checkout takes long time while switching branches
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1736855c9b
commit
52229a29c7
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user