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/gitdiffcore.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/gitdiffcore.txt')
| -rw-r--r-- | Documentation/gitdiffcore.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index c0a60f3158..c970d9fe43 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -242,7 +242,8 @@ textual diff has an added or a deleted line that matches the given regular expression. This means that it will detect in-file (or what rename-detection considers the same file) moves, which is noise. The implementation runs diff twice and greps, and this can be quite -expensive. +expensive. To speed things up binary files without textconv filters +will be ignored. When `-S` or `-G` are used without `--pickaxe-all`, only filepairs that match their respective criterion are kept in the output. When |