diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-07-19 20:26:15 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-07-19 20:26:15 +0000 |
| commit | afabd32f6189eafdf7bbef1ee32c6dd60674063e (patch) | |
| tree | 6a9690e22c05e0495e962953d3c5af7d0aa77a33 /git-mergetool.txt | |
| parent | 78e3a7820b2267111cd2f29fd3d06e8919f2b36c (diff) | |
| download | git-htmldocs-afabd32f6189eafdf7bbef1ee32c6dd60674063e.tar.gz | |
Autogenerated HTML docs for v1.7.2-rc3-52-gc5212
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 55735faf7..e4ed01614 100644 --- a/git-mergetool.txt +++ b/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 <tytso@mit.edu> |