diff options
Diffstat (limited to 'man7/gitdiffcore.7')
| -rw-r--r-- | man7/gitdiffcore.7 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/man7/gitdiffcore.7 b/man7/gitdiffcore.7 index 65c136ed3..b42d9a66b 100644 --- a/man7/gitdiffcore.7 +++ b/man7/gitdiffcore.7 @@ -2,12 +2,12 @@ .\" Title: gitdiffcore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2024-02-06 +.\" Date: 2024-02-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.561.g235986be82 +.\" Source: Git 2.43.0.581.g5216f8f5c4 .\" Language: English .\" -.TH "GITDIFFCORE" "7" "2024\-02\-06" "Git 2\&.43\&.0\&.561\&.g235986" "Git Manual" +.TH "GITDIFFCORE" "7" "2024\-02\-08" "Git 2\&.43\&.0\&.581\&.g5216f8" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -309,11 +309,11 @@ The "extent of changes" parameter can be tweaked from the default 80% (that is, Note that earlier implementation left a broken pair as separate creation and deletion patches\&. This was an unnecessary hack, and the latest implementation always merges all the broken pairs back into modifications, but the resulting patch output is formatted differently for easier review in case of such a complete rewrite by showing the entire contents of the old version prefixed with \fI\-\fR, followed by the entire contents of the new version prefixed with \fI+\fR\&. .SH "DIFFCORE\-PICKAXE: FOR DETECTING ADDITION/DELETION OF SPECIFIED STRING" .sp -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 specify different ways these strings are sought\&. +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 specify different ways these strings are sought\&. .sp -"\-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 \fB\-S\fR omits the filepair (since the number of occurrences of that string didn\(cqt change in that rename\-detected filepair)\&. When used with \fB\-\-pickaxe\-regex\fR, treat the <block of text> as an extended POSIX regular expression to match, instead of a literal string\&. +"\-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 \fB\-S\fR omits the filepair (since the number of occurrences of that string didn\(cqt change in that rename\-detected filepair)\&. When used with \fB\-\-pickaxe\-regex\fR, treat the <block\-of\-text> as an extended POSIX regular expression to match, instead of a literal string\&. .sp -"\-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 implementation runs diff twice and greps, and this can be quite expensive\&. To speed things up, binary files without textconv filters will be ignored\&. +"\-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 implementation runs diff twice and greps, and this can be quite expensive\&. To speed things up, binary files without textconv filters will be ignored\&. .sp When \fB\-S\fR or \fB\-G\fR are used without \fB\-\-pickaxe\-all\fR, only filepairs that match their respective criterion are kept in the output\&. When \fB\-\-pickaxe\-all\fR is used, if even one filepair matches their respective criterion in a changeset, the entire changeset is kept\&. This behavior is designed to make reviewing changes in the context of the whole changeset easier\&. .SH "DIFFCORE\-ORDER: FOR SORTING THE OUTPUT BASED ON FILENAMES" |