undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config.txt: move diff-config.txt to config/

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-10-27 08:22:51 +02:00 committed by Junio C Hamano
parent 2b4b7305d3
commit fa922d74c5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -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

2
Documentation/diff-config.txt → Documentation/config/diff.txt
View File

@ -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