Skip to content

Commit 764243b

Browse files
newrengitster
authored andcommitted
diff: avoid misleading statement about -l option
In commit 6623a52 (doc: clarify documentation for rename/copy limits, 2021-07-15), the wording around rename limit options and config variables were updated to point out that only the quadratic portion of rename detection (or "exhaustive portion of rename/copy detection" as used in that commit) was limited by these options, because exact rename detection and basename-guided rename detection (which both run in time linear in the number of files) still run before this limit is checked. However, the short help message wasn't updated at the time; update it too. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e9019fc commit 764243b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

diff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6186,7 +6186,7 @@ struct option *add_diff_options(const struct option *opts,
61866186
N_("continue listing the history of a file beyond renames"),
61876187
PARSE_OPT_NOARG, diff_opt_follow),
61886188
OPT_INTEGER('l', NULL, &options->rename_limit,
6189-
N_("prevent rename/copy detection if the number of rename/copy targets exceeds given limit")),
6189+
N_("limit to cheap rename/copy detection if the number of rename/copy targets exceeds this value")),
61906190

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

0 commit comments

Comments
 (0)