aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-06 14:17:50 -0800
committerJunio C Hamano <gitster@pobox.com>2020-01-06 14:17:50 -0800
commitc4117fcb97dbf5bc59d9cff09e7e4c0425fe8c27 (patch)
tree82fe99fa9e69e4164a0a98f7259f5908dca9a4a2 /Documentation/git-log.txt
parent556f0258df4c39b32232866e844125a60e60d338 (diff)
parentace0f86c7f527d3e7d0e9fc98ea94675387d2934 (diff)
downloadgit-c4117fcb97dbf5bc59d9cff09e7e4c0425fe8c27.tar.gz
Merge branch 'pb/clarify-line-log-doc'
Doc update. * pb/clarify-line-log-doc: doc: log, gitk: line-log arguments must exist in starting revision doc: log, gitk: document accepted line-log diff formats
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index b406bc4c48..bed09bb09e 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -76,8 +76,12 @@ produced by `--stat`, etc.
(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.
- You can specify this option more than once.
+ give zero or one positive revision arguments, and
+ <start> and <end> (or <funcname>) must exist in the starting revision.
+ You can specify this option more than once. Implies `--patch`.
+ Patch output can be suppressed using `--no-patch`, but other diff formats
+ (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
+ `--name-only`, `--name-status`, `--check`) are not currently implemented.
+
include::line-range-format.txt[]