diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-19 11:21:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-19 11:21:08 -0700 |
| commit | c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (patch) | |
| tree | ef8e9686d647a7e47a6c999cfbca6d0e14bcb1c4 /Documentation | |
| parent | f0e5a4b7f3db2d4e1ded9683817d1d1d3a2a220f (diff) | |
| parent | c173dad58787a7f11a526dbcdaa5a2fe9ff1c87f (diff) | |
| download | git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.gz git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.xz | |
Merge branch 'maint'
* maint:
update-server-info: Shorten read_pack_info_file()
Documentation: Explain git-mergetool's use of temporary files
Diffstat (limited to 'Documentation')
| -rw-r--r-- | 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 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 <tytso@mit.edu> |