diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2021-03-13 00:41:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-13 15:34:32 -0800 |
commit | 53204061acbf7a03a6ba050f381e0bf9b01e3a78 (patch) | |
tree | e088bf64e8c9a853d09cf05b1f0f279cd1944a7f /Documentation/git-mergetool.txt | |
parent | b2a51c1b03c44bd888e2f65c764dced571266482 (diff) | |
download | git-53204061acbf7a03a6ba050f381e0bf9b01e3a78.tar.gz |
doc: describe mergetool configuration in git-mergetool(1)
In particular, this describes mergetool.hideResolved, which can help
users discover this setting (either because it may be useful to them
or in order to understand mergetool's behavior if they have forgotten
setting it in the past).
Tested by running
make -C Documentation git-mergetool.1
man Documentation/git-mergetool.1
and reading through the page.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
-rw-r--r-- | Documentation/git-mergetool.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 6b14702e78..e587c7763a 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -99,6 +99,10 @@ success of the resolution after the custom tool has exited. (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`. +CONFIGURATION +------------- +include::config/mergetool.txt[] + TEMPORARY FILES --------------- `git mergetool` creates `*.orig` backup files while resolving merges. |