blob: 0816f276f161fa55e5cf8ad560878bda135e3b97 (
plain) (
blame)
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
|
NAME
git-rediff - Reduce partially resolved merge conflicts
SYNOPSIS
git rediff [--no-reduce] [--merge|--select-head|--select-tail] [--remove-base] [-i] [<path>...]
DESCRIPTION
git rediff rewrites files containing merge conflicts to
remove conflicts that have been resolved.
OPTIONS
-i
--interactive
Interactively select the action for each merge conflict.
See INTERACTIVE COMMANDS.
This overrides all other options.
--no-interactive
Disable --interactive.
-m
--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 --remove-base.
--no-merge
Disable --merge.
--reduce
Enable reduction of remaining conflicts. (Default)
--no-reduce
Do not reduce remaining conflicts after --merge, --remove-base,
--select-head, and --select-tail have been applied.
--remove-base
Remove the middle branch from three-way merge conflicts.
Applied before --reduce.
--no-remove-base
Disable --remove-base.
--select-head
Resolve each merge conflict by selecting its top branch.
Applied before --reduce.
--no-select-head
Disable --select-head.
--select-tail
Resolve each merge conflict by selecting its bottom branch.
Applied before --reduce.
--no-select-tail
Disable --select-tail.
INTERACTIVE COMMANDS
h Select the top branch.
t Select the bottom branch.
b Remove the middle branch (three-way conflicts only).
m Apply merge selection.
r Reduce the conflict.
e Manually edit the conflict.
s Skip the conflict.
d Skip the conflict and all later conflicts in the current file.
q Quit interaction and skip the conflict and all remaining conflicts.
? Display help.
OPERANDS
path
File to rewrite. If - is specified, the file
is read from standard input, and the result
is written to standard output.
If no path is specified, standard input is read and
the result is written to standard output.
EXIT STATUS
The following exit values are returned:
0 All merge conflicts were resolved.
1 There are still merge conflicts.
2 An error occurred.
|
