Skip to content

Commit 15c6dbd

Browse files
phillipwoodgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent aba4954 commit 15c6dbd

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/git-merge.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ invocations. The automated message can include the branch description.
8383
If `--log` is specified, a shortlog of the commits being merged
8484
will be appended to the specified message.
8585

86-
--[no-]rerere-autoupdate::
86+
--rerere-autoupdate::
87+
--no-rerere-autoupdate::
8788
Allow the rerere mechanism to update the index with the
8889
result of auto-conflict resolution if possible.
8990

0 commit comments

Comments
 (0)