1LEI-REDIFF(1)              public-inbox user manual              LEI-REDIFF(1)
2
3
4

NAME

6       lei-rediff - regenerate a diff with different options
7

SYNOPSIS

9       lei rediff [OPTIONS] LOCATION [LOCATION...]
10
11       lei rediff [OPTIONS] (--stdin|-)
12

DESCRIPTION

14       Read a message from "LOCATION" or stdin and regenerate its diff with
15       the specified git-diff(1) options.  This is useful if you want to
16       change the display of the original patch (e.g., increasing context,
17       coloring moved lines differently, or using an external diff viewer).
18
19       It relies on the contents of the .git directory of your current project
20       working tree.  In other words, it works anywhere git-am(1) works.
21       Otherwise, "--git-dir=" may be specified any number of times to add
22       repositories to build blob data from.
23

OPTIONS

25       In addition to many git-diff(1) options (e.g. "-W", "-w", "-U $LINES")
26       the following options are supported:
27
28       --stdin
29           Read message from stdin.  This is implicit if no arguments are
30           given and stdin is a pipe or regular file.
31
32           For users of text editors and pagers capable of piping its buffer
33           to arbitrary commands, it is useful to pipe a patch email to "lei
34           rediff" before piping it to git-am(1).  The output of "lei rediff"
35           is compatible with "git am" if its input was a patch email.
36
37       --drq[=COUNT]
38           De-Re-Quote.  De-quotes the input and re-quotes (the output).
39           Removes COUNT levels of "> " email reply prefixes and re-adds them
40           upon regenerating the diff.
41
42           This switch is intended as a convenience for running inside a pipe-
43           capable text editor when writing replies to a patch email.  Note:
44           this may over-add "> " prefixes if some input lines are missing ">
45           " prefixes.
46
47           COUNT is 1 if unspecified; in other words, "--drq=1" and "--drq"
48           are equivalent.
49
50           It implies "--quiet" unless "--verbose" is specified since text
51           editors tend to combine stderr with stdout.
52
53       --dequote-only[=COUNT]
54           Like "--drq", but does not re-add quote prefixes to the output.
55
56           This can be useful for feeding a hunk to git-apply(1) or patch(1)
57           while writing a reply or further processing by another diff viewer.
58
59           Unlike "--drq", it does NOT imply "--quiet".
60
61       --git-dir=DIR
62           Specify an additional .git/ directory to scan.  This option may be
63           given multiple times.
64
65           Default: the output of "git rev-parse --git-dir"
66
67       --no-cwd
68           Do not look in the git repository of the current working directory.
69
70       -q
71       --quiet
72           Suppress progress output.
73
74       -v
75       --verbose
76           Provide more feedback on stderr.
77
78       The options below, described in lei-q(1), are also supported.
79
80       --[no-]remote
81       --no-local
82       --no-external
83       --no-import-remote
84       --torsocks=auto|no|yes, --no-torsocks
85       --proxy=PROTOCOL://HOST[:PORT]
86

CONTACT

88       Feedback welcome via plain-text mail to <mailto:meta@public-inbox.org>
89
90       The mail archives are hosted at <https://public-inbox.org/meta/> and
91       <http://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/meta/>
92

94       Copyright 2021 all contributors <mailto:meta@public-inbox.org>
95
96       License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
97

SEE ALSO

99       lei-q(1), lei-blob(1), lei-p2q(1)
100
101
102
103public-inbox.git                  1993-10-02                     LEI-REDIFF(1)
Impressum