diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-09 07:59:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-09 07:59:58 (GMT) |
| commit | 128a9d86da3c156c7d1bf25692eeb68a522af935 (patch) | |
| tree | c741913f11f81167c34ab306c35c8ed95eb88640 /Documentation | |
| parent | ce4f404c6f059abb4988f4549c6e46a3ba0d56ec (diff) | |
| parent | ed24e401e0e6ab860475b8575e28a2c6ea99cc69 (diff) | |
| download | git-128a9d86da3c156c7d1bf25692eeb68a522af935.zip git-128a9d86da3c156c7d1bf25692eeb68a522af935.tar.gz git-128a9d86da3c156c7d1bf25692eeb68a522af935.tar.bz2 | |
Merge branch 'rs/grep-p'
* rs/grep-p:
grep: simplify -p output
grep -p: support user defined regular expressions
grep: add option -p/--show-function
grep: handle pre context lines on demand
grep: print context hunk marks between files
grep: move context hunk mark handling into show_line()
userdiff: add xdiff_clear_find_func()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-grep.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index fccb82d..b753c9d 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -122,6 +122,14 @@ OPTIONS -<num>:: A shortcut for specifying -C<num>. +-p:: +--show-function:: + 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 'git diff' works out + patch hunk headers (see 'Defining a custom hunk-header' in + linkgit:gitattributes[5]). + -f <file>:: Read patterns from <file>, one per line. |