diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-08-11 22:27:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-08-11 22:27:20 +0000 |
| commit | 9775d409cb92c4895a25daaf2928af720b90a933 (patch) | |
| tree | b908add7febc98712bfa761a46e550a27742cb61 /git-grep.html | |
| parent | e1296e9af0b7e04013cdb44f4cac6d9d456719e7 (diff) | |
| download | git-htmldocs-9775d409cb92c4895a25daaf2928af720b90a933.tar.gz | |
Autogenerated HTML docs for v1.7.6-447-gb9176
Diffstat (limited to 'git-grep.html')
| -rw-r--r-- | git-grep.html | 62 |
1 files changed, 48 insertions, 14 deletions
diff --git a/git-grep.html b/git-grep.html index 391649133..a51a127d2 100644 --- a/git-grep.html +++ b/git-grep.html @@ -721,37 +721,71 @@ grep.extendedRegexp </p>
</dd>
<dt class="hdlist1">
--[ABC] <context>
+-p
+</dt>
+<dt class="hdlist1">
+--show-function
</dt>
<dd>
<p>
- Show <tt>context</tt> trailing (<tt>A</tt> — after), or leading (<tt>B</tt>
-  — before), or both (<tt>C</tt> — context) lines, and place a
- line containing <tt>--</tt> between contiguous groups of
- matches.
+ Show the preceding line that contains the function name of
+ the match, unless the matching line is a function name itself.
+ The name is determined in the same way as <em>git diff</em> works out
+ patch hunk headers (see <em>Defining a custom hunk-header</em> in
+ <a href="gitattributes.html">gitattributes(5)</a>).
</p>
</dd>
<dt class="hdlist1">
-<num>
</dt>
+<dt class="hdlist1">
+-C <num>
+</dt>
+<dt class="hdlist1">
+--context <num>
+</dt>
<dd>
<p>
- A shortcut for specifying <tt>-C<num></tt>.
+ Show <num> leading and trailing lines, and place a line
+ containing <tt>--</tt> between contiguous groups of matches.
</p>
</dd>
<dt class="hdlist1">
--p
+-A <num>
</dt>
<dt class="hdlist1">
---show-function
+--after-context <num>
</dt>
<dd>
<p>
- Show the preceding line that contains the function name of
- the match, unless the matching line is a function name itself.
- The name is determined in the same way as <em>git diff</em> works out
- patch hunk headers (see <em>Defining a custom hunk-header</em> in
- <a href="gitattributes.html">gitattributes(5)</a>).
+ Show <num> trailing lines, and place a line containing
+ <tt>--</tt> between contiguous groups of matches.
+</p>
+</dd>
+<dt class="hdlist1">
+-B <num>
+</dt>
+<dt class="hdlist1">
+--before-context <num>
+</dt>
+<dd>
+<p>
+ Show <num> leading lines, and place a line containing
+ <tt>--</tt> between contiguous groups of matches.
+</p>
+</dd>
+<dt class="hdlist1">
+-W
+</dt>
+<dt class="hdlist1">
+--function-context
+</dt>
+<dd>
+<p>
+ Show the surrounding text from the previous line containing a
+ function name up to the one before the next function name,
+ effectively showing the whole function in which the match was
+ found.
</p>
</dd>
<dt class="hdlist1">
@@ -882,7 +916,7 @@ grep.extendedRegexp </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-08-05 00:04:52 UTC
+Last updated 2011-08-11 22:26:57 UTC
</div>
</div>
</body>
|