Skip to content

Commit ea24a76

Browse files
pcloudsgitster
authored andcommitted
config.txt: move mergetool.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7fb5ab4 commit ea24a76

File tree

2 files changed

+54
-53
lines changed

2 files changed

+54
-53
lines changed

Documentation/config.txt

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -373,59 +373,7 @@ include::config/man.txt[]
373373

374374
include::config/merge.txt[]
375375

376-
mergetool.<tool>.path::
377-
Override the path for the given tool. This is useful in case
378-
your tool is not in the PATH.
379-
380-
mergetool.<tool>.cmd::
381-
Specify the command to invoke the specified merge tool. The
382-
specified command is evaluated in shell with the following
383-
variables available: 'BASE' is the name of a temporary file
384-
containing the common base of the files to be merged, if available;
385-
'LOCAL' is the name of a temporary file containing the contents of
386-
the file on the current branch; 'REMOTE' is the name of a temporary
387-
file containing the contents of the file from the branch being
388-
merged; 'MERGED' contains the name of the file to which the merge
389-
tool should write the results of a successful merge.
390-
391-
mergetool.<tool>.trustExitCode::
392-
For a custom merge command, specify whether the exit code of
393-
the merge command can be used to determine whether the merge was
394-
successful. If this is not set to true then the merge target file
395-
timestamp is checked and the merge assumed to have been successful
396-
if the file has been updated, otherwise the user is prompted to
397-
indicate the success of the merge.
398-
399-
mergetool.meld.hasOutput::
400-
Older versions of `meld` do not support the `--output` option.
401-
Git will attempt to detect whether `meld` supports `--output`
402-
by inspecting the output of `meld --help`. Configuring
403-
`mergetool.meld.hasOutput` will make Git skip these checks and
404-
use the configured value instead. Setting `mergetool.meld.hasOutput`
405-
to `true` tells Git to unconditionally use the `--output` option,
406-
and `false` avoids using `--output`.
407-
408-
mergetool.keepBackup::
409-
After performing a merge, the original file with conflict markers
410-
can be saved as a file with a `.orig` extension. If this variable
411-
is set to `false` then this file is not preserved. Defaults to
412-
`true` (i.e. keep the backup files).
413-
414-
mergetool.keepTemporaries::
415-
When invoking a custom merge tool, Git uses a set of temporary
416-
files to pass to the tool. If the tool returns an error and this
417-
variable is set to `true`, then these temporary files will be
418-
preserved, otherwise they will be removed after the tool has
419-
exited. Defaults to `false`.
420-
421-
mergetool.writeToTemp::
422-
Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of
423-
conflicting files in the worktree by default. Git will attempt
424-
to use a temporary directory for these files when set `true`.
425-
Defaults to `false`.
426-
427-
mergetool.prompt::
428-
Prompt before each invocation of the merge resolution program.
376+
include::config/mergetool.txt[]
429377

430378
notes.mergeStrategy::
431379
Which merge strategy to choose by default when resolving notes

Documentation/config/mergetool.txt

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
mergetool.<tool>.path::
2+
Override the path for the given tool. This is useful in case
3+
your tool is not in the PATH.
4+
5+
mergetool.<tool>.cmd::
6+
Specify the command to invoke the specified merge tool. The
7+
specified command is evaluated in shell with the following
8+
variables available: 'BASE' is the name of a temporary file
9+
containing the common base of the files to be merged, if available;
10+
'LOCAL' is the name of a temporary file containing the contents of
11+
the file on the current branch; 'REMOTE' is the name of a temporary
12+
file containing the contents of the file from the branch being
13+
merged; 'MERGED' contains the name of the file to which the merge
14+
tool should write the results of a successful merge.
15+
16+
mergetool.<tool>.trustExitCode::
17+
For a custom merge command, specify whether the exit code of
18+
the merge command can be used to determine whether the merge was
19+
successful. If this is not set to true then the merge target file
20+
timestamp is checked and the merge assumed to have been successful
21+
if the file has been updated, otherwise the user is prompted to
22+
indicate the success of the merge.
23+
24+
mergetool.meld.hasOutput::
25+
Older versions of `meld` do not support the `--output` option.
26+
Git will attempt to detect whether `meld` supports `--output`
27+
by inspecting the output of `meld --help`. Configuring
28+
`mergetool.meld.hasOutput` will make Git skip these checks and
29+
use the configured value instead. Setting `mergetool.meld.hasOutput`
30+
to `true` tells Git to unconditionally use the `--output` option,
31+
and `false` avoids using `--output`.
32+
33+
mergetool.keepBackup::
34+
After performing a merge, the original file with conflict markers
35+
can be saved as a file with a `.orig` extension. If this variable
36+
is set to `false` then this file is not preserved. Defaults to
37+
`true` (i.e. keep the backup files).
38+
39+
mergetool.keepTemporaries::
40+
When invoking a custom merge tool, Git uses a set of temporary
41+
files to pass to the tool. If the tool returns an error and this
42+
variable is set to `true`, then these temporary files will be
43+
preserved, otherwise they will be removed after the tool has
44+
exited. Defaults to `false`.
45+
46+
mergetool.writeToTemp::
47+
Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of
48+
conflicting files in the worktree by default. Git will attempt
49+
to use a temporary directory for these files when set `true`.
50+
Defaults to `false`.
51+
52+
mergetool.prompt::
53+
Prompt before each invocation of the merge resolution program.

0 commit comments

Comments
 (0)