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

diff --git a/builtin-log.c b/builtin-log.c
index 41b6df490f7c52edbee880afa9070c1511cdf442..8d16832f7e9483f7903009459a72efc39e267c98 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -58,6 +58,9 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
                usage(builtin_log_usage);
        argc = setup_revisions(argc, argv, rev, "HEAD");
 
+       if (!rev->show_notes_given && !rev->pretty_given)
+               rev->show_notes = 1;
+
        if (rev->diffopt.pickaxe || rev->diffopt.filter)
                rev->always_show_header = 0;
        if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {