diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:31 -0800 |
| commit | ecdc7cbbac04241f1e5a90fb1fff13cff2ed7a82 (patch) | |
| tree | 865b4149a211b52800c1051950633790b7c9be26 /Documentation/diff-options.txt | |
| parent | 932b867be0cec606ec7355fc25de13ace42f4c71 (diff) | |
| parent | e0e7cb8080cb4a0b3a24f288bf363fe517b49790 (diff) | |
| download | git-ecdc7cbbac04241f1e5a90fb1fff13cff2ed7a82.tar.xz | |
Merge branch 'tb/log-G-binary'
"git log -G<regex>" looked for a hunk in the "git log -p" patch
output that contained a string that matches the given pattern.
Optimize this code to ignore binary files, which by default will
not show any hunk that would match any pattern (unless textconv or
the --text option is in effect, that is).
* tb/log-G-binary:
log -G: ignore binary files
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 0378cd574e..b94d332f71 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -524,6 +524,8 @@ struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block. ++ +Binary files are searched as well. -G<regex>:: Look for differences whose patch text contains added/removed @@ -543,6 +545,9 @@ While `git log -G"regexec\(regexp"` will show this commit, `git log -S"regexec\(regexp" --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 +filter will be ignored. ++ See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information. |