commit 0d114107f58cebdee5e25ea46e161531c24cb5d8
author Junio C Hamano <gitster@pobox.com> Wed Feb 12 12:41:38 2020 -0800
committer Junio C Hamano <gitster@pobox.com> Wed Feb 12 12:41:38 2020 -0800
tree 764055437b95612b7c849310f62770cadff6b616
parent e99c325bb48cc2e30a763963bff0eb3eceed35ec
parent 9299f84921e0bd076cf998aa852fadb73627756f

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

Doc clarification.

* ma/diff-doc-clarify-regexp-example:
  diff-options.txt: avoid "regex" overload in example

Documentation/diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 09faee3..bb31f0c 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -567,13 +567,13 @@
 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
--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