Skip to content

Commit 2be4586

Browse files
phil-blaingitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d9589d4 commit 2be4586

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Documentation/git-log.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ produced by `--stat`, etc.
7777
not give any pathspec limiters. This is currently limited to
7878
a walk starting from a single revision, i.e., you may only
7979
give zero or one positive revision arguments.
80-
You can specify this option more than once.
80+
You can specify this option more than once. Implies `--patch`.
81+
Patch output can be suppressed using `--no-patch`, but other diff formats
82+
(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
83+
`--name-only`, `--name-status`, `--check`) are not currently implemented.
8184
+
8285
include::line-range-format.txt[]
8386

Documentation/gitk.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ linkgit:git-rev-list[1] for a complete list.
106106
not give any pathspec limiters. This is currently limited to
107107
a walk starting from a single revision, i.e., you may only
108108
give zero or one positive revision arguments.
109-
You can specify this option more than once.
109+
You can specify this option more than once. Implies `--patch`.
110+
Patch output can be suppressed using `--no-patch`, but other diff formats
111+
(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
112+
`--name-only`, `--name-status`, `--check`) are not currently implemented.
110113
+
111114
*Note:* gitk (unlike linkgit:git-log[1]) currently only understands
112115
this option if you specify it "glued together" with its argument. Do

0 commit comments

Comments
 (0)