Skip to content
Permalink
Browse files

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>
  • Loading branch information...
Denton-L authored and gitster committed Oct 24, 2018
1 parent 57ba181 commit c217b9384e8ecbde866bfb09e88f1d7f87bc7b29
Showing with 14 additions and 0 deletions.
  1. +8 −0 Documentation/diff-config.txt
  2. +6 −0 Documentation/merge-config.txt
@@ -177,6 +177,14 @@ diff.tool::
Any other value is treated as a custom diff tool and requires
that a corresponding difftool.<tool>.cmd variable is defined.

diff.guitool::
Controls which diff tool is used by linkgit:git-difftool[1] when
the -g/--gui flag is specified. This variable overrides the value
configured in `merge.guitool`. The list below shows the valid
built-in values. Any other value is treated as a custom diff tool
and requires that a corresponding difftool.<guitool>.cmd variable
is defined.

include::mergetools-diff.txt[]

diff.indentHeuristic::
@@ -63,6 +63,12 @@ merge.tool::
Any other value is treated as a custom merge tool and requires
that a corresponding mergetool.<tool>.cmd variable is defined.

merge.guitool::
Controls which merge tool is used by linkgit:git-mergetool[1] when the
-g/--gui flag is specified. The list below shows the valid built-in values.
Any other value is treated as a custom merge tool and requires that a
corresponding mergetool.<guitool>.cmd variable is defined.

include::mergetools-merge.txt[]

merge.verbosity::

0 comments on commit c217b93

Please sign in to comment.
You can’t perform that action at this time.