diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-08-21 09:47:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-08-21 12:43:08 -0700 |
| commit | 7786cc91bb2edb14db56589b9c59f3ee294ac49b (patch) | |
| tree | 48b4ea44beda797d1d2c7887bbee3985e595d996 /Documentation/gitglossary.txt | |
| parent | 32f56600bb6ac6fc57183e79d2c1515dfa56672f (diff) | |
| download | git-rr/mergetool-temporary-filename-tweak.tar.gz | |
Allow the user to change the temporary file name for mergetoolrr/mergetool-temporary-filename-tweak
Using the original filename suffix for the temporary input files to
the merge tool confuses IDEs like Eclipse. This patch introduces
a configurtion option, mergetool.tmpsuffix, which get appended to
the temporary file name. That way the user can choose to use a
suffix like ".tmp", which does not cause confusion.
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitglossary.txt')
0 files changed, 0 insertions, 0 deletions