| commit | 162eba8b43a0e665c8e3439191981412815cc6db | |
| author | Charles Bailey <charles@hashpling.org> | |
| Fri, 12 Dec 2008 21:48:41 +0000 (12 21:48 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Dec 2008 04:53:44 +0000 (12 20:53 -0800) | ||
| tree | 3c9a8f3e169479f02923b2c60f56215b07e83946 | treesnapshot (tar.gz zip) |
| parent | b0169d84df4c09ed7dfcc6aea5aecd177ddda75b | commitdiff |
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>
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>
| Documentation/config.txt | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |