doc: consolidate --rerere-autoupdate description
The `--rerere-autoupdate` option is shared across 5 commands, and are described the same way because it works exactly the same way in these commands. Create a separate file and include it from the help pages for these commands, so that we can improve the description at one place to improve all of them at once, and keep them in sync. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 15, 2022 at 14:32 UTC
0dbc715ae0ccf0991d032173d86890a90bf94814
6 files changed
+9
-20
Documentation/git-am.txt
+1
-4
@@ -112,10 +112,7 @@ default. You can use `--no-utf8` to override this.
112
am.threeWay configuration variable. For more information,
113
see am.threeWay in linkgit:git-config[1].
114
115
---rerere-autoupdate::
116
---no-rerere-autoupdate::
117
- Allow the rerere mechanism to update the index with the
118
- result of auto-conflict resolution if possible.
115
+include::rerere-options.txt[]
116
117
--ignore-space-change::
118
--ignore-whitespace::
Documentation/git-cherry-pick.txt
+1
-4
@@ -156,10 +156,7 @@ effect to your index in a row.
156
Pass the merge strategy-specific option through to the
157
merge strategy. See linkgit:git-merge[1] for details.
158
159
---rerere-autoupdate::
160
---no-rerere-autoupdate::
161
- Allow the rerere mechanism to update the index with the
162
- result of auto-conflict resolution if possible.
159
+include::rerere-options.txt[]
160
161
SEQUENCER SUBCOMMANDS
162
---------------------
Documentation/git-merge.txt
+1
-4
@@ -90,10 +90,7 @@ invocations. The automated message can include the branch description.
90
If `--log` is specified, a shortlog of the commits being merged
91
will be appended to the specified message.
92
93
---rerere-autoupdate::
94
---no-rerere-autoupdate::
95
- Allow the rerere mechanism to update the index with the
96
- result of auto-conflict resolution if possible.
93
+include::rerere-options.txt[]
94
95
--overwrite-ignore::
96
--no-overwrite-ignore::
Documentation/git-rebase.txt
+1
-4
@@ -376,10 +376,7 @@ See also INCOMPATIBLE OPTIONS below.
376
+
377
See also INCOMPATIBLE OPTIONS below.
378
379
---rerere-autoupdate::
380
---no-rerere-autoupdate::
381
- Allow the rerere mechanism to update the index with the
382
- result of auto-conflict resolution if possible.
379
+include::rerere-options.txt[]
380
381
-S[<keyid>]::
382
--gpg-sign[=<keyid>]::
Documentation/git-revert.txt
+1
-4
@@ -112,10 +112,7 @@ effect to your index in a row.
112
Pass the merge strategy-specific option through to the
113
merge strategy. See linkgit:git-merge[1] for details.
114
115
---rerere-autoupdate::
116
---no-rerere-autoupdate::
117
- Allow the rerere mechanism to update the index with the
118
- result of auto-conflict resolution if possible.
115
+include::rerere-options.txt[]
116
117
--reference::
118
Instead of starting the body of the log message with "This
Documentation/rerere-options.txt
new
+4
@@ -0,0 +1,4 @@
1
+--rerere-autoupdate::
2
+--no-rerere-autoupdate::
3
+ Allow the rerere mechanism to update the index with the
4
+ result of auto-conflict resolution if possible.