diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-07-15 14:32:18 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-08-03 13:47:11 -0700 |
commit | 0dbc715ae0ccf0991d032173d86890a90bf94814 (patch) | |
tree | a635b90f462dd78145faad71c76ab06e2beb30a0 /Documentation/git-merge.txt | |
parent | 6a475b71f8c4ce708d69fdc9317aefbde3769e25 (diff) | |
download | git-0dbc715ae0ccf0991d032173d86890a90bf94814.tar.gz |
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-merge.txt')
-rw-r--r-- | Documentation/git-merge.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 3125473cc1..fee1dc2df2 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -90,10 +90,7 @@ invocations. The automated message can include the branch description. If `--log` is specified, a shortlog of the commits being merged will be appended to the specified message. ---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[] --overwrite-ignore:: --no-overwrite-ignore:: |