diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-18 14:13:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-18 14:13:08 -0700 |
| commit | 04495a1941c77d95cb6ad521f45451da4f714af2 (patch) | |
| tree | ad4d9204d5b4c2ac489f99a1051faa1bf48d6ed7 /git-merge.txt | |
| parent | 472c81a0f3cf8038d39479da1e3840ac33fe6ef8 (diff) | |
| download | git-htmldocs-04495a1941c77d95cb6ad521f45451da4f714af2.tar.gz | |
Autogenerated HTML docs for v2.37.2-382-g795ea
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/git-merge.txt b/git-merge.txt index 3125473cc..fee1dc2df 100644 --- a/git-merge.txt +++ b/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:: |