Commits

Anonymous committed 8769e93 Merge

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

Comments (0)

Files changed (1)

Documentation/config.txt

 
 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