diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-09-29 09:04:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-29 09:04:15 -0700 |
| commit | 0b493d2986ab2664a35a87db04154c795f74d3fd (patch) | |
| tree | 6cedffded7f4367108e37bdc2c78c57f2668e66a /builtin/merge.c | |
| parent | Merge branch 'jk/fsmonitor-unused-parameter' (diff) | |
| parent | diff --stat: add config option to limit filename width (diff) | |
| download | git-0b493d2986ab2664a35a87db04154c795f74d3fd.tar.gz git-0b493d2986ab2664a35a87db04154c795f74d3fd.zip | |
Merge branch 'ds/stat-name-width-configuration'
"git diff" learned diff.statNameWidth configuration variable, to
give the default width for the name part in the "--stat" output.
* ds/stat-name-width-configuration:
diff --stat: add config option to limit filename width
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 545da0c8a1..fd21c0d4f4 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -467,6 +467,7 @@ static void finish(struct commit *head_commit, struct diff_options opts; repo_diff_setup(the_repository, &opts); opts.stat_width = -1; /* use full terminal width */ + opts.stat_name_width = -1; /* respect statNameWidth config */ opts.stat_graph_width = -1; /* respect statGraphWidth config */ opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; |