diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
| commit | 6b7d215a58fcad73e1d989b5767c9d3b2ba6608b (patch) | |
| tree | 78de8e7c65f35106dfde60f0e6b4284f09e7f43f /git-merge.txt | |
| parent | e0f71462e15863fa4b188b26e30db0155d52a946 (diff) | |
| download | git-htmldocs-6b7d215a58fcad73e1d989b5767c9d3b2ba6608b.tar.gz | |
Autogenerated HTML docs for v2.21.0-419-gffac5
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 4cc86469f..6294dbc09 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -83,7 +83,8 @@ 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. ---[no-]rerere-autoupdate:: +--rerere-autoupdate:: +--no-rerere-autoupdate:: Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible. |