# [PATCH] Documentation: Explain git-mergetool's use of temporary files 2 messages from 2010-07-18 to 2010-07-24. Participants: David Aguilar, Chris.Cheney. Thread: https://gitlist.dev/t/24425 ## David Aguilar, 2010-07-18 01:46 Subject: [PATCH] Documentation: Explain git-mergetool's use of temporary files Message-ID: <1279417608-6442-1-git-send-email-davvid@gmail.com> URL: https://gitlist.dev/e/1279417608-6442-1-git-send-email-davvid%40gmail.com ``` 'git mergetool' creates '*.orig' backup files in its default configuration. Mention this in its documentation. Signed-off-by: David Aguilar --- Documentation/git-mergetool.txt | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 55735fa..e4ed016 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -72,6 +72,16 @@ success of the resolution after the custom tool has exited. This is the default behaviour; the option is provided to override any configuration settings. +TEMPORARY FILES +--------------- +`git mergetool` creates `*.orig` backup files while resolving merges. +These are safe to remove once a file has been merged and its +`git mergetool` session has completed. + +Setting the `mergetool.keepBackup` configuration variable to `false` +causes `git mergetool` to automatically remove the backup as files +are successfully merged. + Author ------ Written by Theodore Y Ts'o -- 1.7.2.rc2.10.g637ab ``` ## Chris.Cheney, 2010-07-24 16:30 Subject: Re: [PATCH] Documentation: Explain git-mergetool's use of temporary files Message-ID: URL: https://gitlist.dev/e/Xns9DBFB2486416AChrisCheneytesconet%4080.91.229.10 In-Reply-To: <1279417608-6442-1-git-send-email-davvid@gmail.com> ``` David Aguilar wrote in news:1279417608-6442-1-git-send-email-davvid@gmail.com: > 'git mergetool' creates '*.orig' backup files in its > default configuration. Mention this in its documentation. Thanks ```