mergetool: Don't keep temporary merge files unless told to

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 32dcd643d2e9ea82a7b65e295e9aa55f7dd999c2..3d5a8df0cf8e46256353b8884bc3c7a745560467 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -976,6 +976,16 @@ mergetool.keepBackup::
        is set to `false` then this file is not preserved.  Defaults to
        `true` (i.e. keep the backup files).
 
+mergetool.keepTemporaries::
+       When invoking a custom merge tool, git uses a set of temporary
+       files to pass to the tool. If the tool returns an error and this
+       variable is set to `true`, then these temporary files will be
+       preserved, otherwise they will be removed after the tool has
+       exited. Defaults to `false`.
+
+mergetool.prompt::
+       Prompt before each invocation of the merge resolution program.
+
 pack.window::
        The size of the window used by linkgit:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.