summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-31 21:16:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-31 21:28:20 (GMT)
commita2c2cef0cd5210aa870e1d226d348a7ddd0277ff (patch)
tree50f31daaa6c410faec8a6cb2777e7e783afeecf6
parentbc38219f50ba9228945fba8e900d636f15082f16 (diff)
downloadgit-a2c2cef0cd5210aa870e1d226d348a7ddd0277ff.zip
git-a2c2cef0cd5210aa870e1d226d348a7ddd0277ff.tar.gz
git-a2c2cef0cd5210aa870e1d226d348a7ddd0277ff.tar.bz2
gitdiffcore doc: update pickaxe description
The old text described the original design (one side does not have it at all while the other side has it); this was later amended to check if the number of occurrences changed, which is what we currently do with -S. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/gitdiffcore.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index 5d91a7e..6af29a4 100644
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -227,9 +227,9 @@ changes that touch a specified string, and is controlled by the
commands.
When diffcore-pickaxe is in use, it checks if there are
-filepairs whose "result" side has the specified string and
-whose "origin" side does not. Such a filepair represents "the
-string appeared in this changeset". It also checks for the
+filepairs whose "result" side and whose "origin" side have
+different number of specified string. Such a filepair represents
+"the string appeared in this changeset". It also checks for the
opposite case that loses the specified string.
When `\--pickaxe-all` is not in effect, diffcore-pickaxe leaves