diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-26 20:13:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-26 20:13:17 -0700 |
| commit | bf0c5bbe2566d756d7468331161461ea9fec3b1f (patch) | |
| tree | 3179922b7a98d866fcf86406ac62c5825cb37f63 /builtin/log.c | |
| parent | 8194fcaa1f0999064a170ed24d36be5432815dce (diff) | |
| parent | 482ce70e14fdd5d03304a92f1740e6a9022e7958 (diff) | |
| download | git-bf0c5bbe2566d756d7468331161461ea9fec3b1f.tar.gz git-bf0c5bbe2566d756d7468331161461ea9fec3b1f.tar.xz | |
Merge branch 'mg/rev-list-n-parents'
* mg/rev-list-n-parents:
tests: avoid nonportable {foo,bar} glob
rev-list --min-parents,--max-parents: doc, test and completion
revision.c: introduce --min-parents and --max-parents options
t6009: use test_commit() from test-lib.sh
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 796e9e574..4a0f78dc7 100644 --- 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)); |