aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-05-08 20:16:55 -0500
committerJunio C Hamano <gitster@pobox.com>2013-05-17 12:09:21 -0700
commit0460ed2c93d78c753242f835c441f320f792ac54 (patch)
tree7128ca5567b1ed56dba60845ad26b32c40d7a4f5 /Documentation/git-merge.txt
parent9b795193a6a7e963db62d9cd8e86752a40940520 (diff)
downloadgit-0460ed2c93d78c753242f835c441f320f792ac54.tar.gz
git-0460ed2c93d78c753242f835c441f320f792ac54.tar.xz
documentation: trivial style cleanups
White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 42391f2ae..67ca99cd9 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.