diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-03-14 19:12:33 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-03-18 10:24:58 +0900 |
| commit | 15c6dbd877b0df7d52ec23fb9e0004c3baf841e9 (patch) | |
| tree | c9a78258e4a6ef548be95ba010800deeccbb6dd8 /Documentation/git-merge.txt | |
| parent | am/cherry-pick/rebase/revert: document --rerere-autoupdate (diff) | |
| download | tgif-15c6dbd877b0df7d52ec23fb9e0004c3baf841e9.tar.xz | |
merge: tweak --rerere-autoupdate documentation
Spell out --no-rerere-autoupdate explictly to make searching
easier. This matches the other --no options in the man page.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 4cc86469f3..6294dbc09d 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/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. |