rebase-i-p: only list commits that require rewriting in todo
[gitweb.git] / builtin-checkout.c
index 08c6d8614ae2b619f520616fecd45b24fd866732..c4fc2b2c562725018789dead3b86ccfbc4e2925f 100644 (file)
@@ -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;