git-rediff.1


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
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138

.TH GIT-REDIFF 1 GIT-REDIFF
.SH NAME
git-rediff - Reduce partially resolved merge conflicts
.SH SYNOPSIS
.B git rediff
.RB [ --no-reduce ]
.RB [ --merge | --select-head | --select-tail ]
.RB [ --remove-base ]
.RB [ -i ]
.RI [ <path> "...]"
.SH DESCRIPTION
.B git rediff
rewrites files containing merge conflicts to
remove conflicts that have been resolved.
.SH OPTIONS
.TP
.B -i
.TQ
.B --interactive
Interactively select the action for each merge conflict. See
.BR "INTERACTIVE COMMANDS" .

This overrides all other options.
.TP
.B --no-interactive
Disable
.BR --interactive .
.TP
.B -m
.TQ
.B --merge
For conflicts with at least three branches, select the sole branch
whose content differs from all other identical branches, but only
if that is the top or bottom branch.

Applied before
.BR --remove-base .
.TP
.B --no-merge
Disable
.BR --merge .
.TP
.B --reduce
Enable reduction of remaining conflicts. (Default)
.TP
.B --no-reduce
Do not reduce remaining conflicts after
.BR --merge ,
.BR --remove-base ,
.BR --select-head ,
and
.B --select-tail
have been applied.
.TP
.B --remove-base
Remove the middle branch from three-way merge conflicts.

Applied before
.BR --reduce .
.TP
.B --no-remove-base
Disable
.BR --remove-base .
.TP
.B --select-head
Resolve each merge conflict by selecting its top branch.

Applied before
.BR --reduce .
.TP
.B --no-select-head
Disable
.BR --select-head .
.TP
.B --select-tail
Resolve each merge conflict by selecting its bottom branch.

Applied before
.BR --reduce .
.TP
.B --no-select-tail
Disable
.BR --select-tail .
.SH INTERACTIVE COMMANDS
.TP
.B h
Select the top branch.
.TP
.B t
Select the bottom branch.
.TP
.B b
Remove the middle branch (three-way conflicts only).
.TP
.B m
Apply merge selection.
.TP
.B r
Reduce the conflict.
.TP
.B e
Manually edit the conflict.
.TP
.B s
Skip the conflict.
.TP
.B d
Skip the conflict and all later conflicts in the current file.
.TP
.B q
Quit interaction and skip the conflict and all remaining conflicts.
.TP
.B ?
Display help.
.SH OPERANDS
.TP
.I path
File to rewrite. If
.B -
is specified, the file
is read from standard input, and the result
is written to standard output.
.PP
If no
.I path
is specified, standard input is read and
the result is written to standard output.
.SH EXIT STATUS
The following exit values are returned:
.TP
0
All merge conflicts were resolved.
.TP
1
There are still merge conflicts.
.TP
2
An error occurred.