diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-11 21:34:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 21:34:01 (GMT) |
| commit | 811ce1b47c5486fa3348617d062e2eb4593962a1 (patch) | |
| tree | 431dd9d5d47b7ef6b38df1cec32209324529d23a /Documentation/gitk.txt | |
| parent | cd0120857b8112258cef72c0f5adb7f8e8df7c1c (diff) | |
| parent | 0269f968b7effea8a4f61f1fb0ac7e9386a9d90c (diff) | |
| download | git-811ce1b47c5486fa3348617d062e2eb4593962a1.zip git-811ce1b47c5486fa3348617d062e2eb4593962a1.tar.gz git-811ce1b47c5486fa3348617d062e2eb4593962a1.tar.bz2 | |
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 'Documentation/gitk.txt')
| -rw-r--r-- | Documentation/gitk.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 7ae50aa..6ade002 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -99,10 +99,10 @@ linkgit:git-rev-list[1] for a complete list. detailed explanation.) -L<start>,<end>:<file>:: --L:<regex>:<file>:: +-L:<funcname>:<file>:: Trace the evolution of the line range given by "<start>,<end>" - (or the funcname regex <regex>) within the <file>. You may + (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. |