From: Phillip Wood Date: Thu, 14 Mar 2019 19:12:33 GMT Subject: [PATCH v2 2/2] merge: tweak --rerere-autoupdate documentation Message-ID: <20190314191234.25553-3-phillip.wood123@gmail.com> In-Reply-To: <20190314191234.25553-1-phillip.wood123@gmail.com> From: Phillip Wood 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 --- Documentation/git-merge.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. -- 2.21.0