diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:22:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:01 +0900 |
| commit | fa922d74c525a8f66584e50b60b8dfc3cd237a90 (patch) | |
| tree | bcc823f7b0b977342b4eff8fccdb6af637a5fde4 /Documentation | |
| parent | 2b4b7305d376d598892b4dbb9e699109f9dda1b9 (diff) | |
| download | git-fa922d74c525a8f66584e50b60b8dfc3cd237a90.tar.xz | |
config.txt: move diff-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/diff.txt (renamed from Documentation/diff-config.txt) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 83f5ce9056..5693ce7654 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -319,7 +319,7 @@ include::config/credential.txt[] include::config/completion.txt[] -include::diff-config.txt[] +include::config/diff.txt[] difftool.<tool>.path:: Override the path for the given tool. This is useful in case diff --git a/Documentation/diff-config.txt b/Documentation/config/diff.txt index 85bca83c30..e4db77bc82 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/config/diff.txt @@ -177,7 +177,7 @@ diff.tool:: Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined. -include::mergetools-diff.txt[] +include::../mergetools-diff.txt[] diff.indentHeuristic:: Set this option to `true` to enable experimental heuristics |