mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ma/diff-doc-clarify-regexp-example' into maint

Browse Source 
Doc clarification.

* ma/diff-doc-clarify-regexp-example:
  diff-options.txt: avoid "regex" overload in example
This commit is contained in:
Junio C Hamano
2020-02-14 12:42:33 -08:00
parent 7137d6089b 9299f84921
commit b907ca76f0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/diff-options.txt
View File

@ -567,13 +567,13 @@ To illustrate the difference between `-S<regex> --pickaxe-regex` and
file: file:
+ +
---- ----
+ return !regexec(regexp, two->ptr, 1, &regmatch, 0); + return frotz(nitfol, two->ptr, 1, 0);
... ...
- hit = !regexec(regexp, mf2.ptr, 1, &regmatch, 0); - hit = frotz(nitfol, mf2.ptr, 1, 0);
---- ----
+ +
While `git log -G"regexec\(regexp"` will show this commit, `git log While `git log -G"frotz\(nitfol"` will show this commit, `git log
-S"regexec\(regexp" --pickaxe-regex` will not (because the number of -S"frotz\(nitfol" --pickaxe-regex` will not (because the number of
occurrences of that string did not change). occurrences of that string did not change).
+ +
Unless `--text` is supplied patches of binary files without a textconv Unless `--text` is supplied patches of binary files without a textconv