diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-12 12:41:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-12 12:41:38 -0800 |
| commit | 0d114107f58cebdee5e25ea46e161531c24cb5d8 (patch) | |
| tree | 764055437b95612b7c849310f62770cadff6b616 | |
| parent | e99c325bb48cc2e30a763963bff0eb3eceed35ec (diff) | |
| parent | 9299f84921e0bd076cf998aa852fadb73627756f (diff) | |
| download | git-0d114107f58cebdee5e25ea46e161531c24cb5d8.tar.gz | |
Merge branch 'ma/diff-doc-clarify-regexp-example'
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 |