diff options
| author | Jonas Fonseca <fonseca@diku.dk> | 2008-09-25 10:35:38 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 07:46:59 -0700 |
| commit | 7fe4a728a16cf4e873702f8478fa3e28e8ae89ce (patch) | |
| tree | 0741339dd28cb9fac1d78fc5753fc81256d4b8c5 | |
| parent | 85cf643f1b17ee5680ae816eb061f569b4e00478 (diff) | |
| download | git-7fe4a728a16cf4e873702f8478fa3e28e8ae89ce.tar.gz | |
checkout: Do not show local changes when in quiet mode
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | builtin-checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 08c6d8614a..c4fc2b2c56 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -328,7 +328,7 @@ static int merge_working_tree(struct checkout_opts *opts, commit_locked_index(lock_file)) die("unable to write new index file"); - if (!opts->force) + if (!opts->force && !opts->quiet) show_local_changes(&new->commit->object); return 0; |