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>
Jonathan Nieder committed
Mar 13, 2021 at 00:41 UTC
53204061acbf7a03a6ba050f381e0bf9b01e3a78
1 file changed
+4
Documentation/git-mergetool.txt
+4
@@ -99,6 +99,10 @@ success of the resolution after the custom tool has exited.
99
(see linkgit:git-config[1]). To cancel `diff.orderFile`,
100
use `-O/dev/null`.
101
102
+CONFIGURATION
103
+-------------
104
+include::config/mergetool.txt[]
105
+
106
TEMPORARY FILES
107
---------------
108
`git mergetool` creates `*.orig` backup files while resolving merges.