summaryrefslogtreecommitdiffstats
path: root/gitdiffcore.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-09-30 00:04:34 +0000
committerJunio C Hamano <junio@kernel.org>2010-09-30 00:04:34 +0000
commit3b4609d029e2db42b5154f019facecee49196bf0 (patch)
tree6d059b8455a973760f1680791fbdf8c453fe387e /gitdiffcore.html
parent442206cbc570d6bc05423bd8a54db5f06d740c65 (diff)
downloadgit-htmldocs-3b4609d029e2db42b5154f019facecee49196bf0.tar.gz
Autogenerated HTML docs for v1.7.3.1-45-g9855
Diffstat (limited to 'gitdiffcore.html')
-rw-r--r--gitdiffcore.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/gitdiffcore.html b/gitdiffcore.html
index 289eaaf4e..65b582362 100644
--- a/gitdiffcore.html
+++ b/gitdiffcore.html
@@ -552,9 +552,9 @@ changes that touch a specified string, and is controlled by the
-S option and the <tt>--pickaxe-all</tt> option to the <em>git diff-&#42;</em>
commands.</p></div>
<div class="para"><p>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.</p></div>
<div class="para"><p>When <tt>--pickaxe-all</tt> is not in effect, diffcore-pickaxe leaves
only such filepairs that touch the specified string in its
@@ -602,7 +602,7 @@ t</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-18 23:57:06 UTC
+Last updated 2010-09-30 00:03:01 UTC
</div>
</div>
</body>