diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-18 14:15:08 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-18 14:15:08 -0800 |
commit | b7676d5ada0941ade7ac9acb8ce985686b62b2ab (patch) | |
tree | 11ddf24c8178241b09e082064ac45508a805f0e6 /gitk.html | |
parent | ee43d18844df1f78dad8b389cbb393b211073d17 (diff) | |
download | git-htmldocs-b7676d5ada0941ade7ac9acb8ce985686b62b2ab.tar.gz |
Autogenerated HTML docs for v2.29.2-334-gfaefd
Diffstat (limited to 'gitk.html')
-rw-r--r-- | gitk.html | 39 |
1 files changed, 19 insertions, 20 deletions
@@ -893,54 +893,53 @@ command-line parser.</p></div> </dt>
<dd>
<p>
- Trace the evolution of the line range given by "<start>,<end>"
- (or the function name regex <funcname>) within the <file>. You may
+ Trace the evolution of the line range given by <em><start>,<end></em>,
+ or by the function name regex <em><funcname></em>, within the <em><file></em>. 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, and
- <start> and <end> (or <funcname>) must exist in the starting revision.
+ <em><start></em> and <em><end></em> (or <em><funcname></em>) must exist in the starting revision.
You can specify this option more than once. Implies <code>--patch</code>.
Patch output can be suppressed using <code>--no-patch</code>, but other diff formats
(namely <code>--raw</code>, <code>--numstat</code>, <code>--shortstat</code>, <code>--dirstat</code>, <code>--summary</code>,
<code>--name-only</code>, <code>--name-status</code>, <code>--check</code>) are not currently implemented.
</p>
-<div class="paragraph"><p><strong>Note:</strong> gitk (unlike <a href="git-log.html">git-log(1)</a>) currently only understands
-this option if you specify it "glued together" with its argument. Do
-<strong>not</strong> put a space after <code>-L</code>.</p></div>
-<div class="paragraph"><p><start> and <end> can take one of these forms:</p></div>
+<div class="paragraph"><p><em><start></em> and <em><end></em> can take one of these forms:</p></div>
<div class="ulist"><ul>
<li>
<p>
number
</p>
-<div class="paragraph"><p>If <start> or <end> is a number, it specifies an
+<div class="paragraph"><p>If <em><start></em> or <em><end></em> is a number, it specifies an
absolute line number (lines count from 1).</p></div>
</li>
<li>
<p>
-/regex/
+<code>/regex/</code>
</p>
<div class="paragraph"><p>This form will use the first line matching the given
-POSIX regex. If <start> is a regex, it will search from the end of
+POSIX regex. If <em><start></em> is a regex, it will search from the end of
the previous <code>-L</code> range, if any, otherwise from the start of file.
-If <start> is “^/regex/”, it will search from the start of file.
-If <end> is a regex, it will search
-starting at the line given by <start>.</p></div>
+If <em><start></em> is <code>^/regex/</code>, it will search from the start of file.
+If <em><end></em> is a regex, it will search
+starting at the line given by <em><start></em>.</p></div>
</li>
<li>
<p>
+offset or -offset
</p>
-<div class="paragraph"><p>This is only valid for <end> and will specify a number
-of lines before or after the line given by <start>.</p></div>
+<div class="paragraph"><p>This is only valid for <em><end></em> and will specify a number
+of lines before or after the line given by <em><start></em>.</p></div>
</li>
</ul></div>
-<div class="paragraph"><p>If “:<funcname>” is given in place of <start> and <end>, it is a
+<div class="paragraph"><p>If <code>:<funcname></code> is given in place of <em><start></em> and <em><end></em>, it is a
regular expression that denotes the range from the first funcname line
-that matches <funcname>, up to the next funcname line. “:<funcname>”
+that matches <em><funcname></em>, up to the next funcname line. <code>:<funcname></code>
searches from the end of the previous <code>-L</code> range, if any, otherwise
-from the start of file. “^:<funcname>” searches from the start of
-file.</p></div>
+from the start of file. <code>^:<funcname></code> searches from the start of
+file. The function names are determined in the same way as <code>git diff</code>
+works out patch hunk headers (see <em>Defining a custom hunk-header</em>
+in <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
</dd>
<dt class="hdlist1">
<revision range>
@@ -1102,7 +1101,7 @@ of end users.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-11-18 14:12:24 PST
</div>
</div>
</body>
|