aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorPhilippe Blain <levraiphilippeblain@gmail.com>2019-12-26 17:43:36 +0000
committerJunio C Hamano <gitster@pobox.com>2019-12-26 11:00:13 -0800
commit2be45868a840f65ae16d171b5ae503846fa17b95 (patch)
treea108ae35ef194f0b403da20cfbf0d08ea363d9bc /Documentation/git-log.txt
parentd9589d4051537c387b70dc76e430c61b4c85a86d (diff)
downloadgit-2be45868a840f65ae16d171b5ae503846fa17b95.tar.gz
doc: log, gitk: document accepted line-log diff formats
Currently the line-log functionality (git log -L) only supports displaying patch output (`-p | --patch`, its default behavior) and suppressing it (`-s | --no-patch`). A check was added in the code to that effect in 5314efaea (line-log: detect unsupported formats, 2019-03-10) but the documentation was not updated. Explicitly mention that `-L` implies `-p`, that patch output can be suppressed using `-s`, and that all other diff formats are not allowed. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index b02e922dc3..3726ca0d44 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -77,7 +77,10 @@ produced by `--stat`, etc.
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.
+ 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[]