rerere.autoupdate

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5331b450ea051334d53ce3f1e727e33def2ea2cf..0c7cf618ed2847d56d811e39c67ea53bdd71796b 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -650,6 +650,11 @@ gc.rerereunresolved::
        kept for this many days when `git rerere gc` is run.
        The default is 15 days.  See linkgit:git-rerere[1].
 
+rerere.autoupdate::
+       When set to true, `git-rerere` updates the index with the
+       resulting contents after it cleanly resolves conflicts using
+       previously recorded resolution.  Defaults to false.
+
 rerere.enabled::
        Activate recording of resolved conflicts, so that identical
        conflict hunks can be resolved automatically, should they