Merge branch 'maint'
[git/git.git] / builtin-checkout.c
index 4497b70..9a0c173 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");
 
            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;
                show_local_changes(&new->commit->object);
 
        return 0;