pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/builtin-log.c b/builtin-log.c
index 2cb292fa727222487b5fed7f6f4db2bcc4237f49..8d16832f7e9483f7903009459a72efc39e267c98 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -570,7 +570,7 @@ static int reopen_stdout(struct commit *commit, struct rev_info *rev)
 
        get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename);
 
-       if (!DIFF_OPT_TST(&rev->diffopt, QUIET))
+       if (!DIFF_OPT_TST(&rev->diffopt, QUICK))
                fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
 
        if (freopen(filename.buf, "w", stdout) == NULL)