.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. .de Ve \" End verbatim text .ft R .fi .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left .\" double quote, and \*(R" will give a right double quote. \*(C+ will .\" give a nicer C++. Capital omega is used to do unbreakable dashes and .\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, .\" nothing in troff, for use with C<>. .tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- . ds PI pi . if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch . if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch . ds L" "" . ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ . ds -- \|\(em\| . ds PI \(*p . ds L" `` . ds R" '' . ds C` . ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" .\" If the F register is >0, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .\" .\" Avoid warning from groff about undefined register 'F'. .de IX .. .nr rF 0 .if \n(.g .if rF .nr rF 1 .if (\n(rF:(\n(.g==0)) \{\ . if \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . if !\nF==2 \{\ . nr % 0 . nr F 2 . \} . \} .\} .rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ . ds #H 0 . ds #V .8m . ds #F .3m . ds #[ \f1 . ds #] \fP .\} .if t \{\ . ds #H ((1u-(\\\\n(.fu%2u))*.13m) . ds #V .6m . ds #F 0 . ds #[ \& . ds #] \& .\} . \" simple accents for nroff and troff .if n \{\ . ds ' \& . ds ` \& . ds ^ \& . ds , \& . ds ~ ~ . ds / .\} .if t \{\ . ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" . ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' . ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' . ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' . ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' . ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' .\} . \" troff and (daisy-wheel) nroff accents .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' .ds 8 \h'\*(#H'\(*b\h'-\*(#H' .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' .ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] .ds ae a\h'-(\w'a'u*4/10)'e .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ . ds : e . ds 8 ss . ds o a . ds d- d\h'-1'\(ga . ds D- D\h'-1'\(hy . ds th \o'bp' . ds Th \o'LP' . ds ae ae . ds Ae AE .\} .rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "LEI-REDIFF 1" .TH LEI-REDIFF 1 "1993-10-02" "public-inbox.git" "public-inbox user manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" lei\-rediff \- regenerate a diff with different options .SH "SYNOPSIS" .IX Header "SYNOPSIS" lei rediff [\s-1OPTIONS\s0] \s-1LOCATION\s0 [\s-1LOCATION...\s0] .PP lei rediff [\s-1OPTIONS\s0] (\-\-stdin|\-) .SH "DESCRIPTION" .IX Header "DESCRIPTION" Read a message from \f(CW\*(C`LOCATION\*(C'\fR or stdin and regenerate its diff with the specified \fBgit\-diff\fR\|(1) options. This is useful if you want to change the display of the original patch (e.g., increasing context, coloring moved lines differently, or using an external diff viewer). .PP It relies on the contents of the .git directory of your current project working tree. In other words, it works anywhere \&\fBgit\-am\fR\|(1) works. Otherwise, \f(CW\*(C`\-\-git\-dir=\*(C'\fR may be specified any number of times to add repositories to build blob data from. .SH "OPTIONS" .IX Header "OPTIONS" In addition to many \fBgit\-diff\fR\|(1) options (e.g. \f(CW\*(C`\-W\*(C'\fR, \f(CW\*(C`\-w\*(C'\fR, \&\f(CW\*(C`\-U $LINES\*(C'\fR) the following options are supported: .IP "\-\-stdin" 4 .IX Item "--stdin" Read message from stdin. This is implicit if no arguments are given and stdin is a pipe or regular file. .Sp For users of text editors and pagers capable of piping its buffer to arbitrary commands, it is useful to pipe a patch email to \f(CW\*(C`lei rediff\*(C'\fR before piping it to \fBgit\-am\fR\|(1). The output of \f(CW\*(C`lei rediff\*(C'\fR is compatible with \f(CW\*(C`git am\*(C'\fR if its input was a patch email. .IP "\-\-drq[=COUNT]" 4 .IX Item "--drq[=COUNT]" De-Re-Quote. De-quotes the input and re-quotes (the output). Removes \s-1COUNT\s0 levels of \f(CW\*(C`> \*(C'\fR email reply prefixes and re-adds them upon regenerating the diff. .Sp This switch is intended as a convenience for running inside a pipe-capable text editor when writing replies to a patch email. Note: this may over-add \f(CW\*(C`> \*(C'\fR prefixes if some input lines are missing \f(CW\*(C`> \*(C'\fR prefixes. .Sp \&\s-1COUNT\s0 is 1 if unspecified; in other words, \f(CW\*(C`\-\-drq=1\*(C'\fR and \&\f(CW\*(C`\-\-drq\*(C'\fR are equivalent. .Sp It implies \*(L"\-\-quiet\*(R" unless \*(L"\-\-verbose\*(R" is specified since text editors tend to combine stderr with stdout. .IP "\-\-dequote\-only[=COUNT]" 4 .IX Item "--dequote-only[=COUNT]" Like \*(L"\-\-drq\*(R", but does not re-add quote prefixes to the output. .Sp This can be useful for feeding a hunk to \fBgit\-apply\fR\|(1) or \fBpatch\fR\|(1) while writing a reply or further processing by another diff viewer. .Sp Unlike \*(L"\-\-drq\*(R", it does \s-1NOT\s0 imply \*(L"\-\-quiet\*(R". .IP "\-\-git\-dir=DIR" 4 .IX Item "--git-dir=DIR" Specify an additional .git/ directory to scan. This option may be given multiple times. .Sp Default: the output of \f(CW\*(C`git rev\-parse \-\-git\-dir\*(C'\fR .IP "\-\-no\-cwd" 4 .IX Item "--no-cwd" Do not look in the git repository of the current working directory. .IP "\-q" 4 .IX Item "-q" .PD 0 .IP "\-\-quiet" 4 .IX Item "--quiet" .PD Suppress progress output. .IP "\-v" 4 .IX Item "-v" .PD 0 .IP "\-\-verbose" 4 .IX Item "--verbose" .PD Provide more feedback on stderr. .PP The options below, described in \fBlei\-q\fR\|(1), are also supported. .IP "\-\-[no\-]remote" 4 .IX Item "--[no-]remote" .PD 0 .IP "\-\-no\-local" 4 .IX Item "--no-local" .IP "\-\-no\-external" 4 .IX Item "--no-external" .IP "\-\-no\-import\-remote" 4 .IX Item "--no-import-remote" .IP "\-\-torsocks=auto|no|yes, \-\-no\-torsocks" 4 .IX Item "--torsocks=auto|no|yes, --no-torsocks" .IP "\-\-proxy=PROTOCOL://HOST[:PORT]" 4 .IX Item "--proxy=PROTOCOL://HOST[:PORT]" .PD .SH "CONTACT" .IX Header "CONTACT" Feedback welcome via plain-text mail to .PP The mail archives are hosted at and .SH "COPYRIGHT" .IX Header "COPYRIGHT" Copyright 2021 all contributors .PP License: \s-1AGPL\-3.0+\s0 .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fBlei\-q\fR\|(1), \fBlei\-blob\fR\|(1), \fBlei\-p2q\fR\|(1)