Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
gitdiffcore doc: update pickaxe description
author
Junio C Hamano
<gitster@pobox.com>
Tue, 31 Aug 2010 21:16:39 +0000
(14:16 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 31 Aug 2010 21:28:20 +0000
(14:28 -0700)
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>
Documentation/gitdiffcore.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
bc38219
)
diff --git
a/Documentation/gitdiffcore.txt
b/Documentation/gitdiffcore.txt
index 5d91a7e5b3a40cbf41f03a81799c162775c36607..6af29a4603de57e0040c4bcd819b831dd6649f92 100644
(file)
--- 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
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
opposite case that loses the specified string.
When `\--pickaxe-all` is not in effect, diffcore-pickaxe leaves