Merge branch 'mg/rev-list-n-parents'

[git.git] / builtin / log.c

diff --git a/builtin/log.c b/builtin/log.c
index 796e9e57460468748d1e2af975ac52a6470a379d..4a0f78dc7139ac529e60e7e1099834ff7efe1163 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1061,7 +1061,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        rev.commit_format = CMIT_FMT_EMAIL;
        rev.verbose_header = 1;
        rev.diff = 1;
-       rev.no_merges = 1;
+       rev.max_parents = 1;
        DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
        rev.subject_prefix = fmt_patch_subject_prefix;
        memset(&s_r_opt, 0, sizeof(s_r_opt));