[60/78] config.txt: move rerere.* to a separate file
diff mbox series

Message ID 20181027062351.30446-61-pclouds@gmail.com
State New
Headers show
Series
  • nd/config-split reroll
Related show

Commit Message

Duy Nguyen Oct. 27, 2018, 6:23 a.m. UTC
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Documentation/config.txt        | 13 +------------
 Documentation/config/rerere.txt | 12 ++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/config/rerere.txt

Patch
diff mbox series

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0ce5081f22..71bab1f3b8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -399,18 +399,7 @@  include::config/remotes.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.
diff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.txt
new file mode 100644
index 0000000000..40abdf6a6b
--- /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.