diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:23:19 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:03 +0900 |
| commit | 7fb5ab4a020185c74007ca04ca6f8de9a3ae3868 (patch) | |
| tree | 6fb381adefa6734ee8665f12562294e9f998b3a9 /Documentation | |
| parent | config.txt: move man.* to a separate file (diff) | |
| download | tgif-7fb5ab4a020185c74007ca04ca6f8de9a3ae3868.tar.xz | |
config.txt: move merge-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/merge.txt (renamed from Documentation/merge-config.txt) | 4 | ||||
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
3 files changed, 4 insertions, 4 deletions
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.<tool>.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 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.<tool>.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.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and |