diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-15 23:32:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-03 22:47:11 +0200 |
| commit | 0dbc715ae0ccf0991d032173d86890a90bf94814 (patch) | |
| tree | a635b90f462dd78145faad71c76ab06e2beb30a0 /Documentation/git-cherry-pick.txt | |
| parent | The sixth batch (diff) | |
| download | git-0dbc715ae0ccf0991d032173d86890a90bf94814.tar.xz git-0dbc715ae0ccf0991d032173d86890a90bf94814.zip | |
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>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 78dcc9171f..1e8ac9df60 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -156,10 +156,7 @@ effect to your index in a row. Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details. ---rerere-autoupdate:: ---no-rerere-autoupdate:: - Allow the rerere mechanism to update the index with the - result of auto-conflict resolution if possible. +include::rerere-options.txt[] SEQUENCER SUBCOMMANDS --------------------- |