From: David Aguilar Date: Sun, 18 Jul 2010 01:46:48 +0000 (-0700) Subject: Documentation: Explain git-mergetool's use of temporary files X-Git-Tag: v1.7.2~7^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1cc4621eda62222fbc929a7f65c89b6be678c2e;p=git.git Documentation: Explain git-mergetool's use of temporary files 'git mergetool' creates '*.orig' backup files in its default configuration. Mention this in its documentation. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 55735faf7..e4ed01614 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