Merge branch 'maint'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e9e2b0cd9fc6724b50cfca611a5e28fd0d70b0f1..c2325ef90e336a37df42eb7f71f95e3581c83127 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -9,8 +9,9 @@ git-merge - Join two or more development histories together
 SYNOPSIS
 --------
 [verse]
-'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
-       [-m <msg>] <commit>...
+'git merge' [-n] [--stat] [--no-commit] [--squash]
+       [-s <strategy>] [-X <strategy-option>]
+       [--[no-]rerere-autoupdate] [-m <msg>] <commit>...
 'git merge' <msg> HEAD <commit>...
 
 DESCRIPTION
@@ -61,6 +62,11 @@ include::merge-options.txt[]
        used to give a good default for automated 'git merge'
        invocations.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+       Allow the rerere mechanism to update the index with the
+       result of auto-conflict resolution if possible.
+
 <commit>...::
        Commits, usually other branch heads, to merge into our branch.
        You need at least one <commit>.  Specifying more than one