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>
Phillip Wood committed
Mar 14, 2019 at 19:12 UTC
15c6dbd877b0df7d52ec23fb9e0004c3baf841e9
1 file changed
+2
-1
Documentation/git-merge.txt
+2
-1
@@ -83,7 +83,8 @@ invocations. The automated message can include the branch description.
83
If `--log` is specified, a shortlog of the commits being merged
84
will be appended to the specified message.
85
86
---[no-]rerere-autoupdate::
86
+--rerere-autoupdate::
87
+--no-rerere-autoupdate::
88
Allow the rerere mechanism to update the index with the
89
result of auto-conflict resolution if possible.
90