kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Phillip Wood 2019-03-14 19:12:33 +00:00 committed by Junio C Hamano
parent aba4954cb0
commit 15c6dbd877
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-merge.txt
View File

@ -83,7 +83,8 @@ invocations. The automated message can include the branch description.
If `--log` is specified, a shortlog of the commits being merged If `--log` is specified, a shortlog of the commits being merged
will be appended to the specified message. 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 Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible. result of auto-conflict resolution if possible.