From 0460ed2c93d78c753242f835c441f320f792ac54 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Wed, 8 May 2013 20:16:55 -0500 Subject: documentation: trivial style cleanups White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- Documentation/git-merge.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Documentation/git-merge.txt') diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 42391f2ae7..67ca99cd92 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -76,8 +76,7 @@ The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. ---rerere-autoupdate:: ---no-rerere-autoupdate:: +--[no-]rerere-autoupdate:: Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible. -- cgit v1.2.3