Andrew's git / gitweb.git / blobdiff
?
Merge branch 'nd/clone-connectivity-shortcut'
[gitweb.git] / Documentation / git-merge.txt
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 42391f2ae76aa579605470b6cad8cf4812f29aae..67ca99cd92e371ae7518d4574e2a8507d78e0823 100644 (file)
--- 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.