Skip to content

Commit

Permalink
checkout: show progress when checkout takes long time while switching…
Browse files Browse the repository at this point in the history
… branches

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Feb 23, 2008
1 parent 1736855 commit 52229a2
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions builtin-checkout.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 52229a2

Please sign in to comment.