Merge branch 'ab/trace2-typofix'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 44e00329e1b0e6b1c3d55316121992492f5b1ea9..f5e6ae3907bae3af8a86ae5c43775f9b39c48e47 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below.
 +
 See also INCOMPATIBLE OPTIONS below.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+       Allow the rerere mechanism to update the index with the
+       result of auto-conflict resolution if possible.
+
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
        GPG-sign commits. The `keyid` argument is optional and