diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-11 12:36:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-11 12:36:18 -0700 |
| commit | 4c90d8908ac0c7ec9cd8d2caee7a1a0394636612 (patch) | |
| tree | f2e35ad1607e81d578c6ffe9798b7129c1579f05 /diff-merges.c | |
| parent | 7cfaa86fe6f61698752d13c59ac97a102d1fbaae (diff) | |
| parent | 6a38e33331560c3e84123c567f95de72d1cfa506 (diff) | |
| download | git-4c90d8908ac0c7ec9cd8d2caee7a1a0394636612.tar.gz | |
Merge branch 'jn/log-m-does-not-imply-p'
Earlier "git log -m" was changed to always produce patch output,
which would break existing scripts, which has been reverted.
* jn/log-m-does-not-imply-p:
Revert 'diff-merges: let "-m" imply "-p"'
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/diff-merges.c b/diff-merges.c index 0dfcaa1b11..d897fd8a29 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -107,7 +107,6 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) if (!strcmp(arg, "-m")) { set_to_default(revs); - revs->merges_imply_patch = 1; } else if (!strcmp(arg, "-c")) { set_combined(revs); revs->merges_imply_patch = 1; |