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

Message ID	20181027062351.30446-61-pclouds@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= <pclouds@gmail.com> Subject: [PATCH 60/78] config.txt: move rerere.* to a separate file Date: Sat, 27 Oct 2018 08:23:33 +0200 Message-Id: <20181027062351.30446-61-pclouds@gmail.com> In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	nd/config-split reroll \| expand [00/78] nd/config-split reroll [01/78] Update makefile in preparation for Documentation/config/.txt [02/78] config.txt: move advice. to a separate file [03/78] config.txt: move core.* to a separate file [04/78] config.txt: move add.* to a separate file [05/78] config.txt: move alias.* to a separate file [06/78] config.txt: move am.* to a separate file [07/78] config.txt: move apply.* to a separate file [08/78] config.txt: move blame.* to a separate file [09/78] config.txt: move branch.* to a separate file [10/78] config.txt: move browser.* to a separate file [11/78] config.txt: move checkout.* to a separate file [12/78] config.txt: move clean.* to a separate file [13/78] config.txt: move color.* to a separate file [14/78] config.txt: move column.* to a separate file [15/78] config.txt: move commit.* to a separate file [16/78] config.txt: move credential.* to a separate file [17/78] config.txt: move completion.* to a separate file [18/78] config.txt: move diff-config.txt to config/ [19/78] config.txt: move difftool.* to a separate file [20/78] config.txt: move fastimport.* to a separate file [21/78] config.txt: move fetch-config.txt to config/ [22/78] config.txt: move filter.* to a separate file [23/78] config.txt: move format-config.txt to config/ [24/78] config.txt: move fmt-merge-msg-config.txt to config/ [25/78] config.txt: move fsck.* to a separate file [26/78] config.txt: move gc.* to a separate file [27/78] config.txt: move gitcvs-config.txt to config/ [28/78] config.txt: move gitweb.* to a separate file [29/78] config.txt: move grep.* to a separate file [30/78] config.txt: move gpg.* to a separate file [31/78] config.txt: move gui-config.txt to config/ [32/78] config.txt: move guitool.* to a separate file [33/78] config.txt: move help.* to a separate file [34/78] config.txt: move ssh.* to a separate file [35/78] config.txt: move http.* to a separate file [36/78] config.txt: move i18n.* to a separate file [37/78] git-imap-send.txt: move imap.* to a separate file [38/78] config.txt: move index.* to a separate file [39/78] config.txt: move init.* to a separate file [40/78] config.txt: move instaweb.* to a separate file [41/78] config.txt: move interactive.* to a separate file [42/78] config.txt: move log.* to a separate file [43/78] config.txt: move mailinfo.* to a separate file [44/78] config.txt: move mailmap.* to a separate file [45/78] config.txt: move man.* to a separate file [46/78] config.txt: move merge-config.txt to config/ [47/78] config.txt: move mergetool.* to a separate file [48/78] config.txt: move notes.* to a separate file [49/78] config.txt: move pack.* to a separate file [50/78] config.txt: move pager.* to a separate file [51/78] config.txt: move pretty.* to a separate file [52/78] config.txt: move protocol.* to a separate file [53/78] config.txt: move pull-config.txt to config/ [54/78] config.txt: move push-config.txt to config/ [55/78] config.txt: move rebase-config.txt to config/ [56/78] config.txt: move receive-config.txt to config/ [57/78] config.txt: move remote.* to a separate file [58/78] config.txt: move remotes.* to a separate file [59/78] config.txt: move repack.* to a separate file [60/78] config.txt: move rerere.* to a separate file [61/78] config.txt: move reset.* to a separate file [62/78] config.txt: move sendemail-config.txt to config/ [63/78] config.txt: move sequencer.* to a separate file [64/78] config.txt: move showBranch.* to a separate file [65/78] config.txt: move splitIndex.* to a separate file [66/78] config.txt: move status.* to a separate file [67/78] config.txt: move stash.* to a separate file [68/78] config.txt: move submodule.* to a separate file [69/78] config.txt: move tag.* to a separate file [70/78] config.txt: move transfer.* to a separate file [71/78] config.txt: move uploadarchive.* to a separate file [72/78] config.txt: move uploadpack.* to a separate file [73/78] config.txt: move url.* to a separate file [74/78] config.txt: move user.* to a separate file [75/78] config.txt: move versionsort.* to a separate file [76/78] config.txt: move web.* to a separate file [77/78] config.txt: move worktree.* to a separate file

Message ID

20181027062351.30446-61-pclouds@gmail.com (mailing list archive)

State

New, archived

Headers

From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?=
	=?utf-8?b?4buNYyBEdXk=?=  <pclouds@gmail.com>
Subject: [PATCH 60/78] config.txt: move rerere.* to a separate file
Date: Sat, 27 Oct 2018 08:23:33 +0200
Message-Id: <20181027062351.30446-61-pclouds@gmail.com>
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-1-pclouds@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

nd/config-split reroll | expand

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

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.

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

Commit Message

Patch