X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-mergetool.txt;h=e4ed0161467866f731c89eb48e64453051c64281;hb=aee9c7d6540fe6f66fbbe7be420caa26ae0fa2d9;hp=55735faf7b58dfa56f7a7b93b5e0d7f19b98a808;hpb=037c43c68e220739e690540de89a6d5835fefe73;p=git.git 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