Merge remote branch 'remotes/trast-doc/for-next'

[git.git] / Documentation / git-merge.txt

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c88bebe367b56d872baa2a298b62aa64d6df4a4c..d4ef0d0ce2a3c75f964465e25106f9ab3ac53d89 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
-       [-m <msg>] <commit>...
+       [--[no-]rerere-autoupdate] [-m <msg>] <commit>...
 'git merge' <msg> HEAD <commit>...
 
 DESCRIPTION
@@ -37,6 +37,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