summaryrefslogtreecommitdiff
path: root/Documentation/git-grep.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-11 11:03:09 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-11 11:03:09 -0700
commit5fb249aec763205f8d26370a18c5adb167008dd8 (patch)
treed3fcf60ccad806d032855dcb390992071a7f5dea /Documentation/git-grep.txt
parent1c1b7eed5c7fc6ca397eab006be67646c9f599d7 (diff)
parent317f63c21c8eac46813eacf487485445f2f79a6d (diff)
downloadgit-5fb249aec763205f8d26370a18c5adb167008dd8.tar.gz
Merge branch 'rs/grep-function-context'
* rs/grep-function-context: grep: long context options grep: add option to show whole function as context
Diffstat (limited to 'Documentation/git-grep.txt')
-rw-r--r--Documentation/git-grep.txt32
1 files changed, 23 insertions, 9 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 062711139c..e44a4988b7 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -155,15 +155,6 @@ OPTIONS
Show the filename above the matches in that file instead of
at the start of each shown line.
--[ABC] <context>::
- Show `context` trailing (`A` -- after), or leading (`B`
- -- before), or both (`C` -- context) lines, and place a
- line containing `--` between contiguous groups of
- matches.
-
--<num>::
- A shortcut for specifying `-C<num>`.
-
-p::
--show-function::
Show the preceding line that contains the function name of
@@ -172,6 +163,29 @@ OPTIONS
patch hunk headers (see 'Defining a custom hunk-header' in
linkgit:gitattributes[5]).
+-<num>::
+-C <num>::
+--context <num>::
+ Show <num> leading and trailing lines, and place a line
+ containing `--` between contiguous groups of matches.
+
+-A <num>::
+--after-context <num>::
+ Show <num> trailing lines, and place a line containing
+ `--` between contiguous groups of matches.
+
+-B <num>::
+--before-context <num>::
+ Show <num> leading lines, and place a line containing
+ `--` between contiguous groups of matches.
+
+-W::
+--function-context::
+ 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.
+
-f <file>::
Read patterns from <file>, one per line.