Skip to content

Commit c4117fc

Browse files
committed
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
2 parents 556f025 + ace0f86 commit c4117fc

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Documentation/git-log.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@ produced by `--stat`, etc.
7676
(or the function name regex <funcname>) within the <file>. You may
7777
not give any pathspec limiters. This is currently limited to
7878
a walk starting from a single revision, i.e., you may only
79-
give zero or one positive revision arguments.
80-
You can specify this option more than once.
79+
give zero or one positive revision arguments, and
80+
<start> and <end> (or <funcname>) must exist in the starting revision.
81+
You can specify this option more than once. Implies `--patch`.
82+
Patch output can be suppressed using `--no-patch`, but other diff formats
83+
(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
84+
`--name-only`, `--name-status`, `--check`) are not currently implemented.
8185
+
8286
include::line-range-format.txt[]
8387

Documentation/gitk.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,12 @@ linkgit:git-rev-list[1] for a complete list.
105105
(or the function name regex <funcname>) within the <file>. You may
106106
not give any pathspec limiters. This is currently limited to
107107
a walk starting from a single revision, i.e., you may only
108-
give zero or one positive revision arguments.
109-
You can specify this option more than once.
108+
give zero or one positive revision arguments, and
109+
<start> and <end> (or <funcname>) must exist in the starting revision.
110+
You can specify this option more than once. Implies `--patch`.
111+
Patch output can be suppressed using `--no-patch`, but other diff formats
112+
(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
113+
`--name-only`, `--name-status`, `--check`) are not currently implemented.
110114
+
111115
*Note:* gitk (unlike linkgit:git-log[1]) currently only understands
112116
this option if you specify it "glued together" with its argument. Do

0 commit comments

Comments
 (0)