diff options
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/diff-merges.c b/diff-merges.c index 66c8ba0cc6..9d19225b3e 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -34,10 +34,10 @@ static void set_m(struct rev_info *revs) { /* * To "diff-index", "-m" means "match missing", and to the "log" - * family of commands, it means "show full diff for merges". Set + * family of commands, it means "show default diff for merges". Set * both fields appropriately. */ - set_separate(revs); + set_to_default(revs); revs->match_missing = 1; } @@ -61,13 +61,13 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg) return suppress; if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent")) return set_first_parent; - else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate")) + else if (!strcmp(optarg, "separate")) return set_separate; else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined")) return set_combined; else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined")) return set_dense_combined; - else if (!strcmp(optarg, "on")) + else if (!strcmp(optarg, "m") || !strcmp(optarg, "on")) return set_to_default; return NULL; } |