aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-05 21:00:36 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-05 21:00:36 -0700
commit67498507699641549094f0cbf8800f88176b50c9 (patch)
tree952672be724d1f36844131d1b73e2e148d6fd212 /Documentation/git-log.txt
parent64c9e027658124a29aeae47e43fa08aaff760f43 (diff)
parent0269f968b7effea8a4f61f1fb0ac7e9386a9d90c (diff)
downloadgit-67498507699641549094f0cbf8800f88176b50c9.tar.gz
Merge branch 'mm/usage-log-l-can-take-regex'
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/git-log.txt')
-rw-r--r--Documentation/git-log.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 18bc716a0c..5692945a0b 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -62,9 +62,9 @@ produced by `--stat`, etc.
output by allowing them to allocate space in advance.
-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.