| commit | 7786cc91bb2edb14db56589b9c59f3ee294ac49b | |
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Thu, 21 Aug 2014 07:47:20 +0000 (21 09:47 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Aug 2014 19:43:08 +0000 (21 12:43 -0700) | ||
| tree | 48b4ea44beda797d1d2c7887bbee3985e595d996 | treesnapshot (tar.gz zip) |
| parent | 32f56600bb6ac6fc57183e79d2c1515dfa56672f | commitdiff |
Allow the user to change the temporary file name for mergetool
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>
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>
| Documentation/config.txt | diffblobblamehistory | |
| Documentation/git-mergetool.txt | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |