diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:33 -0800 |
| commit | b907ca76f0897f9a7f070a106c7706fc399509da (patch) | |
| tree | c286a11ab7e2df19967833a93ae4827e07dc2fc5 | |
| parent | Merge branch 'ms/doc-bundle-format' into maint (diff) | |
| parent | diff-options.txt: avoid "regex" overload in example (diff) | |
| download | tgif-b907ca76f0897f9a7f070a106c7706fc399509da.tar.xz | |
Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
Doc clarification.
* ma/diff-doc-clarify-regexp-example:
diff-options.txt: avoid "regex" overload in example
| -rw-r--r-- | Documentation/diff-options.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 09faee3b44..bb31f0c42b 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -567,13 +567,13 @@ To illustrate the difference between `-S<regex> --pickaxe-regex` and file: + ---- -+ return !regexec(regexp, two->ptr, 1, ®match, 0); ++ return frotz(nitfol, two->ptr, 1, 0); ... -- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0); +- hit = frotz(nitfol, mf2.ptr, 1, 0); ---- + -While `git log -G"regexec\(regexp"` will show this commit, `git log --S"regexec\(regexp" --pickaxe-regex` will not (because the number of +While `git log -G"frotz\(nitfol"` will show this commit, `git log +-S"frotz\(nitfol" --pickaxe-regex` will not (because the number of occurrences of that string did not change). + Unless `--text` is supplied patches of binary files without a textconv |