From: Phillip Wood Date: Thu, 14 Mar 2019 19:12:33 +0000 (+0000) Subject: merge: tweak --rerere-autoupdate documentation X-Git-Tag: v2.22.0-rc0~109^2 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=15c6dbd877b0df7d52ec23fb9e0004c3baf841e9 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 Signed-off-by: Junio C Hamano --- 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.