aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-09-29 09:04:14 -0700
committerJunio C Hamano <gitster@pobox.com>2023-09-29 09:04:15 -0700
commit0b493d2986ab2664a35a87db04154c795f74d3fd (patch)
tree6cedffded7f4367108e37bdc2c78c57f2668e66a /builtin/rebase.c
parentMerge branch 'jk/fsmonitor-unused-parameter' (diff)
parentdiff --stat: add config option to limit filename width (diff)
downloadgit-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/rebase.c')
-rw-r--r--builtin/rebase.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 50cb85751f..ed15accec9 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1804,6 +1804,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
/* We want color (if set), but no pager */
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;