From 7fb5ab4a020185c74007ca04ca6f8de9a3ae3868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sat, 27 Oct 2018 08:23:19 +0200 Subject: [PATCH] config.txt: move merge-config.txt to config/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- Documentation/{merge-config.txt => config/merge.txt} | 4 ++-- Documentation/git-merge.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename Documentation/{merge-config.txt => config/merge.txt} (98%) diff --git a/Documentation/config.txt b/Documentation/config.txt index c3c92bc269..441787e815 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -371,7 +371,7 @@ include::config/mailmap.txt[] include::config/man.txt[] -include::merge-config.txt[] +include::config/merge.txt[] mergetool..path:: Override the path for the given tool. This is useful in case diff --git a/Documentation/merge-config.txt b/Documentation/config/merge.txt similarity index 98% rename from Documentation/merge-config.txt rename to Documentation/config/merge.txt index 0bb703fbac..321d1c8ba9 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/config/merge.txt @@ -30,7 +30,7 @@ merge.verifySignatures:: If true, this is equivalent to the --verify-signatures command line option. See linkgit:git-merge[1] for details. -include::config/fmt-merge-msg.txt[] +include::fmt-merge-msg.txt[] merge.renameLimit:: The number of files to consider when performing rename detection @@ -63,7 +63,7 @@ merge.tool:: Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined. -include::mergetools-merge.txt[] +include::../mergetools-merge.txt[] merge.verbosity:: Controls the amount of output shown by the recursive merge diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index eb36837f86..4cc86469f3 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -342,7 +342,7 @@ include::merge-strategies.txt[] CONFIGURATION ------------- -include::merge-config.txt[] +include::config/merge.txt[] branch..mergeOptions:: Sets default options for merging into branch . The syntax and