diff options
| author | Charles Bailey <charles@hashpling.org> | 2008-12-12 21:48:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-12 20:53:44 -0800 |
| commit | 162eba8b43a0e665c8e3439191981412815cc6db (patch) | |
| tree | 3c9a8f3e169479f02923b2c60f56215b07e83946 /Documentation | |
| parent | b0169d84df4c09ed7dfcc6aea5aecd177ddda75b (diff) | |
| download | git-162eba8b43a0e665c8e3439191981412815cc6db.tar.gz | |
mergetool: Don't keep temporary merge files unless told to
This changes git mergetool to remove the temporary files used to invoke
the merge tool even if it returns non-zero.
This also adds a configuration option (mergetool.keepTemporaries) to
retain the previous behaviour if desired.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bc5642d603..3d5a8df0cf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -976,6 +976,13 @@ 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. |