Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6: Documentation: rerere.enabled is the primary way to configure rerere
git-mirror · Jan 6, 2012 · 8769e93 · 8769e93
2 parents c07aa5b + 07b88a0
commit 8769e93
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -1708,10 +1708,10 @@ rerere.autoupdate::
 
 rerere.enabled::
 	Activate recording of resolved conflicts, so that identical
-	conflict hunks can be resolved automatically, should they
-	be encountered again.  linkgit:git-rerere[1] command is by
-	default enabled if you create `rr-cache` directory under
-	`$GIT_DIR`, but can be disabled by setting this option to false.
+	conflict hunks can be resolved automatically, should they be
+	encountered again.  By default, linkgit:git-rerere[1] is
+	enabled if there is an `rr-cache` directory under the
+	`$GIT_DIR`.
 
 sendemail.identity::
 	A configuration identity. When given, causes values in the