user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
f34e946ffe5267919e19db0545ecc0c5c2617ea4 blob 2297 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
 
=head1 NAME

lei-rediff - regenerate a diff with different options

=head1 SYNOPSIS

lei rediff [OPTIONS] LOCATION [LOCATION...]

lei rediff [OPTIONS] (--stdin|-)

=head1 DESCRIPTION

Read a message from C<LOCATION> or stdin and regenerate its diff with
the specified L<git-diff(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).

It relies on the contents of the .git directory of your current
project working tree.  In other words, it works anywhere
L<git-am(1)> works.  Otherwise, C<--git-dir=> may be specified
any number of times to add repositories to build blob data from.

=head1 OPTIONS

In addition to many L<git-diff(1)> options (e.g. C<-W>, C<-w>,
C<-U $LINES>) the following options are supported:

=over

=item --stdin

Read message from stdin.  This is implicit if no arguments are given
and stdin is a pipe or regular file.

For users of text editors and pagers capable of piping its
buffer to arbitrary commands, it is useful to pipe a patch email
to C<lei rediff> before piping it to L<git-am(1)>.  The output
of C<lei rediff> is compatible with C<git am> if its input was a
patch email.

=item --git-dir=DIR

Specify an additional .git/ directory to scan.  This option may be
given multiple times.

Default: the output of C<git rev-parse --git-dir>

=item --no-cwd

Do not look in the git repository of the current working directory.

=item -q

=item --quiet

Suppress progress output.

=item -v

=item --verbose

Provide more feedback on stderr.

=back

The options below, described in L<lei-q(1)>, are also supported.

=over

=item --[no-]remote

=item --no-local

=item --no-external

=item --no-import-remote

=item --torsocks=auto|no|yes, --no-torsocks

=item --proxy=PROTO://HOST[:PORT]

=back

=head1 CONTACT

Feedback welcome via plain-text mail to L<mailto:meta@public-inbox.org>

The mail archives are hosted at L<https://public-inbox.org/meta/>
and L<http://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/meta/>

=head1 COPYRIGHT

Copyright 2021 all contributors L<mailto:meta@public-inbox.org>

License: AGPL-3.0+ L<https://www.gnu.org/licenses/agpl-3.0.txt>

=head1 SEE ALSO

L<lei-q(1)>, L<lei-blob(1)>, L<lei-p2q(1)>
debug log:

solving f34e946ffe52 ...
found f34e946ffe52 in https://80x24.org/public-inbox.git

Code repositories for project(s) associated with this inbox:

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).