diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:34:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:34:01 -0700 |
| commit | 811ce1b47c5486fa3348617d062e2eb4593962a1 (patch) | |
| tree | 431dd9d5d47b7ef6b38df1cec32209324529d23a /line-log.c | |
| parent | cd0120857b8112258cef72c0f5adb7f8e8df7c1c (diff) | |
| parent | 0269f968b7effea8a4f61f1fb0ac7e9386a9d90c (diff) | |
Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3
Documentation fix.
* mm/usage-log-l-can-take-regex:
log -L: improve error message on malformed argument
Documentation: change -L:<regex> to -L:<funcname>
Diffstat (limited to 'line-log.c')
| -rw-r--r-- | line-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/line-log.c b/line-log.c index b7864ad586..1a6bc5921b 100644 --- a/line-log.c +++ b/line-log.c @@ -575,7 +575,7 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args) name_part = skip_range_arg(item->string); if (!name_part || *name_part != ':' || !name_part[1]) - die("-L argument '%s' not of the form start,end:file", + die("-L argument not 'start,end:file' or ':funcname:file': %s", item->string); range_part = xstrndup(item->string, name_part - item->string); name_part++; |