doc: document diff/merge.guitool config keys
Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Oct 24, 2018 at 12:25 UTC
c217b9384e8ecbde866bfb09e88f1d7f87bc7b29
2 files changed
+14
Documentation/diff-config.txt
+8
@@ -177,6 +177,14 @@ diff.tool::
177
Any other value is treated as a custom diff tool and requires
178
that a corresponding difftool.<tool>.cmd variable is defined.
179
180
+diff.guitool::
181
+ Controls which diff tool is used by linkgit:git-difftool[1] when
182
+ the -g/--gui flag is specified. This variable overrides the value
183
+ configured in `merge.guitool`. The list below shows the valid
184
+ built-in values. Any other value is treated as a custom diff tool
185
+ and requires that a corresponding difftool.<guitool>.cmd variable
186
+ is defined.
187
+
188
include::mergetools-diff.txt[]
189
190
diff.indentHeuristic::
Documentation/merge-config.txt
+6
@@ -63,6 +63,12 @@ merge.tool::
63
Any other value is treated as a custom merge tool and requires
64
that a corresponding mergetool.<tool>.cmd variable is defined.
65
66
+merge.guitool::
67
+ Controls which merge tool is used by linkgit:git-mergetool[1] when the
68
+ -g/--gui flag is specified. The list below shows the valid built-in values.
69
+ Any other value is treated as a custom merge tool and requires that a
70
+ corresponding mergetool.<guitool>.cmd variable is defined.
71
+
72
include::mergetools-merge.txt[]
73
74
merge.verbosity::