3 lei-rediff - regenerate a diff with different options
7 lei rediff [OPTIONS] LOCATION [LOCATION...]
9 lei rediff [OPTIONS] (--stdin|-)
13 Read a message from C<LOCATION> or stdin and regenerate its diff with
14 the specified L<git-diff(1)> options. This is useful if you want to
15 change the display of the original patch (e.g., increasing context,
16 coloring moved lines differently, or using an external diff viewer).
18 It relies on the contents of the .git directory of your current
19 project working tree. In other words, it works anywhere
20 L<git-am(1)> works. Otherwise, C<--git-dir=> may be specified
21 any number of times to add repositories to build blob data from.
25 In addition to many L<git-diff(1)> options (e.g. C<-W>, C<-w>,
26 C<-U $LINES>) the following options are supported:
32 Read message from stdin. This is implicit if no arguments are given
33 and stdin is a pipe or regular file.
35 For users of text editors and pagers capable of piping its
36 buffer to arbitrary commands, it is useful to pipe a patch email
37 to C<lei rediff> before piping it to L<git-am(1)>. The output
38 of C<lei rediff> is compatible with C<git am> if its input was a
43 De-Re-Quote. De-quotes the input and re-quotes (the output).
44 Removes COUNT levels of C<E<gt> > email reply prefixes and
45 re-adds them upon regenerating the diff.
47 This switch is intended as a convenience for running inside a
48 pipe-capable text editor when writing replies to a patch email.
49 Note: this may over-add C<E<gt> > prefixes if some input lines
50 are missing C<E<gt> > prefixes.
52 COUNT is 1 if unspecified; in other words, C<--drq=1> and
53 C<--drq> are equivalent.
55 It implies L</--quiet> unless L</--verbose> is specified
56 since text editors tend to combine stderr with stdout.
58 =item --dequote-only[=COUNT]
60 Like L</--drq>, but does not re-add quote prefixes to the output.
62 This can be useful for feeding a hunk to L<git-apply(1)>
63 or L<patch(1)> while writing a reply or further processing
64 by another diff viewer.
66 Unlike L</--drq>, it does NOT imply L</--quiet>.
70 Specify an additional .git/ directory to scan. This option may be
73 Default: the output of C<git rev-parse --git-dir>
77 Do not look in the git repository of the current working directory.
83 Suppress progress output.
89 Provide more feedback on stderr.
93 The options below, described in L<lei-q(1)>, are also supported.
103 =item --no-import-remote
105 =item --torsocks=auto|no|yes, --no-torsocks
107 =item --proxy=PROTO://HOST[:PORT]
113 Feedback welcome via plain-text mail to L<mailto:meta@public-inbox.org>
115 The mail archives are hosted at L<https://public-inbox.org/meta/>
116 and L<http://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/meta/>
120 Copyright 2021 all contributors L<mailto:meta@public-inbox.org>
122 License: AGPL-3.0+ L<https://www.gnu.org/licenses/agpl-3.0.txt>
126 L<lei-q(1)>, L<lei-blob(1)>, L<lei-p2q(1)>