config.txt: move rerere.* to a separate file

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0ce5081f225ff3d1a4bc7794f3b58cac83fca43c..71bab1f3b886d49a63d0a39e2166aff4c43ef759 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -399,18 +399,7 @@ include::config/remotes.txt[]
 
 include::config/repack.txt[]
 
 
 include::config/repack.txt[]
 

-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 be
-       encountered again.  By default, linkgit:git-rerere[1] is
-       enabled if there is an `rr-cache` directory under the
-       `$GIT_DIR`, e.g. if "rerere" was previously used in the
-       repository.
+include::config/rerere.txt[]

 
 reset.quiet::
        When set to true, 'git reset' will default to the '--quiet' option.
 
 reset.quiet::
        When set to true, 'git reset' will default to the '--quiet' option.

diff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.txt
new file mode 100644 (file)
index 0000000..40abdf6
--- /dev/null
+++ b/Documentation/config/rerere.txt
@@ -0,0 +1,12 @@
+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 be
+       encountered again.  By default, linkgit:git-rerere[1] is
+       enabled if there is an `rr-cache` directory under the
+       `$GIT_DIR`, e.g. if "rerere" was previously used in the
+       repository.