diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-02-23 15:37:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-23 15:42:18 -0800 |
| commit | 52229a29c78df2e48de23ed70ab1934667971d3c (patch) | |
| tree | 69213b58cc2117c0cdf0af803f133d16ddf43c33 | |
| parent | Add merge-subtree back (diff) | |
| download | tgif-52229a29c78df2e48de23ed70ab1934667971d3c.tar.xz | |
checkout: show progress when checkout takes long time while switching branches
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-checkout.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 5f176c6c38..283831e8af 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; |