From 121c813f8d6054dbee25c03301599c0f8d645d7f Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jun 2008 02:04:31 -0700
Subject: rerere.autoupdate

When this configuration is set, paths that are autoresolved by git-rerere
are updated in the index as well.
---
 Documentation/config.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Documentation/config.txt')

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5331b450ea..0c7cf618ed 100644
--- 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
-- 
cgit v1.2.1