summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-18 15:16:05 -0800
committerJunio C Hamano <gitster@pobox.com>2019-01-18 15:16:05 -0800
commitace33e4fa1aa5ba14bafe92218bf07dea068791f (patch)
tree0ad7636f0f64e4f949fd65f468e206bc0a5d969b /diff-options.txt
parentde48f457367f37c28229ebe8e6cef849dd6e430a (diff)
downloadgit-htmldocs-ace33e4fa1aa5ba14bafe92218bf07dea068791f.tar.gz
Autogenerated HTML docs for v2.20.1-309-g16a465
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt
index 0378cd574..b94d332f7 100644
--- a/diff-options.txt
+++ b/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.