Merge branch 'en/diff-l-opt-help'

The help text for the '-l' option of 'git diff' has been updated.

* en/diff-l-opt-help:
  diff: avoid misleading statement about -l option
main
Junio C Hamano 2026-08-24 13:17:51 -07:00
commit 66573dbe3a
1 changed files with 1 additions and 1 deletions

2
diff.c
View File

@ -6165,7 +6165,7 @@ struct option *add_diff_options(const struct option *opts,
N_("continue listing the history of a file beyond renames"), N_("continue listing the history of a file beyond renames"),
PARSE_OPT_NOARG, diff_opt_follow), PARSE_OPT_NOARG, diff_opt_follow),
OPT_INTEGER('l', NULL, &options->rename_limit, OPT_INTEGER('l', NULL, &options->rename_limit,
N_("prevent rename/copy detection if the number of rename/copy targets exceeds given limit")), N_("limit to cheap rename/copy detection if the number of rename/copy targets exceeds this value")),


OPT_GROUP(N_("Diff algorithm options")), OPT_GROUP(N_("Diff algorithm options")),
OPT_CALLBACK_F(0, "minimal", options, NULL, OPT_CALLBACK_F(0, "minimal", options, NULL,