mirror of
https://github.com/git/git.git
synced 2024-05-05 15:16:34 +02:00
0cce88f1e4
Several Git commands can make use of the builtin userdiff patterns, but it's not obvious in the documentation. Add pointers to the 'Defining a custom hunk header' part of gitattributes(5) in the description of the following options: - the '--function-context' option of `git diff` and friends - the '--function-context' option of `git grep` - the '-L :<funcname>' option of `git log`, `gitk` and `git blame` In 'git-grep.txt', take the opportunity to use backticks in the description of '--show-function', and improve the wording of the desription of '--function-context'. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
33 lines
1.1 KiB
Plaintext
33 lines
1.1 KiB
Plaintext
'<start>' and '<end>' can take one of these forms:
|
|
|
|
- number
|
|
+
|
|
If '<start>' or '<end>' is a number, it specifies an
|
|
absolute line number (lines count from 1).
|
|
+
|
|
|
|
- `/regex/`
|
|
+
|
|
This form will use the first line matching the given
|
|
POSIX regex. If '<start>' is a regex, it will search from the end of
|
|
the previous `-L` 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>'.
|
|
+
|
|
|
|
- +offset or -offset
|
|
+
|
|
This is only valid for '<end>' and will specify a number
|
|
of lines before or after the line given by '<start>'.
|
|
|
|
+
|
|
If `:<funcname>` is given in place of '<start>' and '<end>', it is a
|
|
regular expression that denotes the range from the first funcname line
|
|
that matches '<funcname>', up to the next funcname line. `:<funcname>`
|
|
searches from the end of the previous `-L` range, if any, otherwise
|
|
from the start of file. `^:<funcname>` searches from the start of
|
|
file. The function names are determined in the same way as `git diff`
|
|
works out patch hunk headers (see 'Defining a custom hunk-header'
|
|
in linkgit:gitattributes[5]).
|