diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 15:48:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 15:48:36 -0800 |
| commit | 6546a509a43eda541b7749ee45837d7a74ba7339 (patch) | |
| tree | a4753bbbeb6fa8a064cbcf570aadb5d4354a1ceb /gitdiffcore.html | |
| parent | c2015e3db30c76ee24b99a14d244f62f1467f581 (diff) | |
| download | git-htmldocs-6546a509a43eda541b7749ee45837d7a74ba7339.tar.gz | |
Autogenerated HTML docs for v2.43.0-581-g5216f
Diffstat (limited to 'gitdiffcore.html')
| -rw-r--r-- | gitdiffcore.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gitdiffcore.html b/gitdiffcore.html index b29f33347..1d303137d 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html @@ -1016,18 +1016,18 @@ version prefixed with <em>+</em>.</p></div> <div class="sectionbody">
<div class="paragraph"><p>This transformation limits the set of filepairs to those that change
specified strings between the preimage and the postimage in a certain
-way. -S<block of text> and -G<regular expression> options are used to
+way. -S<block-of-text> and -G<regular-expression> options are used to
specify different ways these strings are sought.</p></div>
-<div class="paragraph"><p>"-S<block of text>" detects filepairs whose preimage and postimage
+<div class="paragraph"><p>"-S<block-of-text>" detects filepairs whose preimage and postimage
have different number of occurrences of the specified block of text.
By definition, it will not detect in-file moves. Also, when a
changeset moves a file wholesale without affecting the interesting
string, diffcore-rename kicks in as usual, and <code>-S</code> omits the filepair
(since the number of occurrences of that string didn’t change in that
rename-detected filepair). When used with <code>--pickaxe-regex</code>, treat
-the <block of text> as an extended POSIX regular expression to match,
+the <block-of-text> as an extended POSIX regular expression to match,
instead of a literal string.</p></div>
-<div class="paragraph"><p>"-G<regular expression>" (mnemonic: grep) detects filepairs whose
+<div class="paragraph"><p>"-G<regular-expression>" (mnemonic: grep) detects filepairs whose
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
@@ -1108,7 +1108,7 @@ not sorted when diffcore-order is in effect.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-23 14:43:46 PDT
+ 2024-02-08 15:45:59 PST
</div>
</div>
</body>
|