am/cherry-pick/rebase/revert: document --rerere-autoupdate
This option was missing from the man pages of these commands. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Mar 14, 2019 at 19:12 UTC
aba4954cb05fa60bc00ada3bdfcbe6d72d9b8380
4 files changed
+20
Documentation/git-am.txt
+5
@@ -99,6 +99,11 @@ default. You can use `--no-utf8` to override this.
99
am.threeWay configuration variable. For more information,
100
see am.threeWay in linkgit:git-config[1].
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
+
107
--ignore-space-change::
108
--ignore-whitespace::
109
--whitespace=<option>::
Documentation/git-cherry-pick.txt
+5
@@ -148,6 +148,11 @@ effect to your index in a row.
148
Pass the merge strategy-specific option through to the
149
merge strategy. See linkgit:git-merge[1] for details.
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
+
156
SEQUENCER SUBCOMMANDS
157
---------------------
158
include::sequencer.txt[]
Documentation/git-rebase.txt
+5
@@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below.
300
+
301
See also INCOMPATIBLE OPTIONS below.
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
+
308
-S[<keyid>]::
309
--gpg-sign[=<keyid>]::
310
GPG-sign commits. The `keyid` argument is optional and
Documentation/git-revert.txt
+5
@@ -101,6 +101,11 @@ effect to your index in a row.
101
Pass the merge strategy-specific option through to the
102
merge strategy. See linkgit:git-merge[1] for details.
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
+
109
SEQUENCER SUBCOMMANDS
110
---------------------
111
include::sequencer.txt[]