diff options
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/core.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/diff.txt | 8 | ||||
| -rw-r--r-- | Documentation/config/merge.txt | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt index 73430b635b..30adc61195 100644 --- a/Documentation/config/core.txt +++ b/Documentation/config/core.txt @@ -247,7 +247,7 @@ core.alternateRefsCommand:: When advertising tips of available history from an alternate, use the shell to execute the specified command instead of linkgit:git-for-each-ref[1]. The first argument is the absolute path of the alternate. Output must contain one - hex object id per line (i.e., the same as produce by `git for-each-ref + hex object id per line (i.e., the same as produced by `git for-each-ref --format='%(objectname)'`). + Note that you cannot generally put `git for-each-ref` directly into the config diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index e4db77bc82..e48bb987d7 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.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:: diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt index 321d1c8ba9..d389c73929 100644 --- a/Documentation/config/merge.txt +++ b/Documentation/config/merge.txt @@ -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:: |