Skip to content

Commit aba4954

Browse files
phillipwoodgitster
authored andcommitted
am/cherry-pick/rebase/revert: document --rerere-autoupdate
This option was missing from the man pages of these commands. Signed-off-by: Phillip Wood <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e902e9b commit aba4954

File tree

4 files changed

+20
-0
lines changed

4 files changed

+20
-0
lines changed

Documentation/git-am.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ default. You can use `--no-utf8` to override this.
9999
am.threeWay configuration variable. For more information,
100100
see am.threeWay in linkgit:git-config[1].
101101

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+
102107
--ignore-space-change::
103108
--ignore-whitespace::
104109
--whitespace=<option>::

Documentation/git-cherry-pick.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ effect to your index in a row.
148148
Pass the merge strategy-specific option through to the
149149
merge strategy. See linkgit:git-merge[1] for details.
150150

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+
151156
SEQUENCER SUBCOMMANDS
152157
---------------------
153158
include::sequencer.txt[]

Documentation/git-rebase.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below.
300300
+
301301
See also INCOMPATIBLE OPTIONS below.
302302

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+
303308
-S[<keyid>]::
304309
--gpg-sign[=<keyid>]::
305310
GPG-sign commits. The `keyid` argument is optional and

Documentation/git-revert.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ effect to your index in a row.
101101
Pass the merge strategy-specific option through to the
102102
merge strategy. See linkgit:git-merge[1] for details.
103103

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+
104109
SEQUENCER SUBCOMMANDS
105110
---------------------
106111
include::sequencer.txt[]

0 commit comments

Comments
 (0)