File tree Expand file tree Collapse file tree 4 files changed +20
-0
lines changed Expand file tree Collapse file tree 4 files changed +20
-0
lines changed Original file line number Diff line number Diff line change @@ -99,6 +99,11 @@ default. You can use `--no-utf8` to override this.
99
99
am.threeWay configuration variable. For more information,
100
100
see am.threeWay in linkgit:git-config[1].
101
101
102
+ --rerere-autoupdate::
103
+ --no-rerere-autoupdate::
104
+ Allow the rerere mechanism to update the index with the
105
+ result of auto-conflict resolution if possible.
106
+
102
107
--ignore-space-change::
103
108
--ignore-whitespace::
104
109
--whitespace=<option>::
Original file line number Diff line number Diff line change @@ -148,6 +148,11 @@ effect to your index in a row.
148
148
Pass the merge strategy-specific option through to the
149
149
merge strategy. See linkgit:git-merge[1] for details.
150
150
151
+ --rerere-autoupdate::
152
+ --no-rerere-autoupdate::
153
+ Allow the rerere mechanism to update the index with the
154
+ result of auto-conflict resolution if possible.
155
+
151
156
SEQUENCER SUBCOMMANDS
152
157
---------------------
153
158
include::sequencer.txt[]
Original file line number Diff line number Diff line change @@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below.
300
300
+
301
301
See also INCOMPATIBLE OPTIONS below.
302
302
303
+ --rerere-autoupdate::
304
+ --no-rerere-autoupdate::
305
+ Allow the rerere mechanism to update the index with the
306
+ result of auto-conflict resolution if possible.
307
+
303
308
-S[<keyid>]::
304
309
--gpg-sign[=<keyid>]::
305
310
GPG-sign commits. The `keyid` argument is optional and
Original file line number Diff line number Diff line change @@ -101,6 +101,11 @@ effect to your index in a row.
101
101
Pass the merge strategy-specific option through to the
102
102
merge strategy. See linkgit:git-merge[1] for details.
103
103
104
+ --rerere-autoupdate::
105
+ --no-rerere-autoupdate::
106
+ Allow the rerere mechanism to update the index with the
107
+ result of auto-conflict resolution if possible.
108
+
104
109
SEQUENCER SUBCOMMANDS
105
110
---------------------
106
111
include::sequencer.txt[]
You can’t perform that action at this time.
0 commit comments